2:58 p.m.
Author: thomas.heute(a)jboss.com
Date: 2009-08-25 15:58:54 -0400 (Tue, 25 Aug 2009)
New Revision: 56
Added:
components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml
components/pc/trunk/portal/src/assemble/simple-portal-war-jboss51.xml
components/pc/trunk/portal/src/main/resources/jboss51/
components/pc/trunk/test/src/test/resources/jboss-5.1/
Removed:
components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml
components/pc/trunk/portal/src/assemble/simple-portal-war-jboss50.xml
components/pc/trunk/portal/src/main/resources/jboss50/
components/pc/trunk/test/src/test/resources/jboss-5.0/
Modified:
components/pc/trunk/pc/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
components/pc/trunk/test/pom.xml
components/pc/trunk/test/src/test/build.xml
components/pc/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml
components/pc/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml
components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml
components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml
components/pc/trunk/test/src/test/resources/test/servers.xml
Log:
Test on JBoss 4.2 and JBoss 5.1
Modified: components/pc/trunk/pc/pom.xml
===================================================================
--- components/pc/trunk/pc/pom.xml 2009-08-25 19:52:10 UTC (rev 55)
+++ components/pc/trunk/pc/pom.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -186,13 +186,11 @@
</execution>
</executions>
<configuration>
-
- <!--Uncomment if needed-->
- <!--<jpda>false</jpda>-->
- <!--<jpdaPort>9000</jpdaPort>-->
- <!--<jpdaSuspend>true</jpdaSuspend>-->
- <!--<failOnError>false</failOnError>-->
- <!--<assertions>true</assertions>-->
+ <jpda>false</jpda>
+ <jpdaPort>9000</jpdaPort>
+ <jpdaSuspend>true</jpdaSuspend>
+ <failOnError>false</failOnError>
+ <assertions>true</assertions>
<testsuites>
<testsuite>
<config>local-jboss-unit.xml</config>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2009-08-25 19:52:10 UTC (rev 55)
+++ components/pc/trunk/portal/pom.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -150,7 +150,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>
+
<descriptor>src/assemble/simple-portal-jboss51.xml</descriptor>
</descriptors>
</configuration>
<executions>
Deleted: components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml 2009-08-25 19:52:10
UTC (rev 55)
+++ components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml 2009-08-25 19:58:54
UTC (rev 56)
@@ -1,89 +0,0 @@
-<!--
- ~ JBoss, a division of Red Hat
- ~ Copyright 2009, 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.
- -->
-
-<assembly>
- <id>jboss50</id>
- <formats>
- <format>dir</format>
- </formats>
- <baseDirectory>simple-portal</baseDirectory>
-
- <componentDescriptors>
-
<componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor>
-
<componentDescriptor>src/assemble/simple-portal-war-jboss50.xml</componentDescriptor>
- </componentDescriptors>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
-
- <include>org.gatein.common:common-common</include>
- <include>org.gatein.wci:wci-wci</include>
- <include>org.gatein.pc:pc-pc</include>
- <include>org.gatein.pc:pc-api</include>
- <include>org.gatein.pc:pc-federation</include>
- <include>javax.ccpp:ccpp</include>
- <include>javax.portlet:portlet-api</include>
-
- <include>org.exoplatform.kernel:exo.kernel.container</include>
- <include>org.exoplatform.kernel:exo.kernel.commons</include>
- <!-- temporarly till we get rid of this dependency -->
-
<include>org.exoplatform.portletcontainer:exo.pc.component.common</include>
- <include>picocontainer:picocontainer</include>
- <include>javax.xml.bind:jaxb-api</include>
- <include>org.jibx:jibx-run</include>
- <include>org.slf4j:slf4j-api</include>
- <include>org.slf4j:slf4j-jdk14</include>
- <include>javax.xml.stream:stax-api</include>
- <include>xpp3:xpp3</include>
- <include>commons-logging:commons-logging</include>
- <include>sun-jaxb:jaxb-api</include>
-
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory>
- <includes>
-
- <include>org.gatein.common:common-mc</include>
- <include>org.gatein.pc:pc-controller</include>
- <include>org.gatein.pc:pc-mc</include>
- <include>org.gatein.pc:pc-exo-integration</include>
- <include>org.gatein.pc:pc-samples</include>
- <include>org.jboss:jboss-common-core</include>
- <include>org.jboss:jboss-reflect</include>
- <include>org.jboss:jboss-mdr</include>
- <include>org.jboss:jbossxb</include>
-
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory></outputDirectory>
- <includes>
- <include></include>
- </includes>
- </dependencySet>
- </dependencySets>
-
-</assembly>
Copied: components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml (from rev 49,
components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml)
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml
(rev 0)
+++ components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml 2009-08-25 19:58:54
UTC (rev 56)
@@ -0,0 +1,89 @@
+<!--
+ ~ JBoss, a division of Red Hat
+ ~ Copyright 2009, 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.
+ -->
+
+<assembly>
+ <id>jboss50</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <baseDirectory>simple-portal</baseDirectory>
+
+ <componentDescriptors>
+
<componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor>
+
<componentDescriptor>src/assemble/simple-portal-war-jboss51.xml</componentDescriptor>
+ </componentDescriptors>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+
+ <include>org.gatein.common:common-common</include>
+ <include>org.gatein.wci:wci-wci</include>
+ <include>org.gatein.pc:pc-pc</include>
+ <include>org.gatein.pc:pc-api</include>
+ <include>org.gatein.pc:pc-federation</include>
+ <include>javax.ccpp:ccpp</include>
+ <include>javax.portlet:portlet-api</include>
+
+ <include>org.exoplatform.kernel:exo.kernel.container</include>
+ <include>org.exoplatform.kernel:exo.kernel.commons</include>
+ <!-- temporarly till we get rid of this dependency -->
+
<include>org.exoplatform.portletcontainer:exo.pc.component.common</include>
+ <include>picocontainer:picocontainer</include>
+ <include>javax.xml.bind:jaxb-api</include>
+ <include>org.jibx:jibx-run</include>
+ <include>org.slf4j:slf4j-api</include>
+ <include>org.slf4j:slf4j-jdk14</include>
+ <include>javax.xml.stream:stax-api</include>
+ <include>xpp3:xpp3</include>
+ <include>commons-logging:commons-logging</include>
+ <include>sun-jaxb:jaxb-api</include>
+
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory>
+ <includes>
+
+ <include>org.gatein.common:common-mc</include>
+ <include>org.gatein.pc:pc-controller</include>
+ <include>org.gatein.pc:pc-mc</include>
+ <include>org.gatein.pc:pc-exo-integration</include>
+ <include>org.gatein.pc:pc-samples</include>
+ <include>org.jboss:jboss-common-core</include>
+ <include>org.jboss:jboss-reflect</include>
+ <include>org.jboss:jboss-mdr</include>
+ <include>org.jboss:jbossxb</include>
+
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include></include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Deleted: components/pc/trunk/portal/src/assemble/simple-portal-war-jboss50.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-war-jboss50.xml 2009-08-25
19:52:10 UTC (rev 55)
+++ components/pc/trunk/portal/src/assemble/simple-portal-war-jboss50.xml 2009-08-25
19:58:54 UTC (rev 56)
@@ -1,12 +0,0 @@
-<component>
-
- <fileSets>
-
- <fileSet>
- <directory>src/main/resources/jboss50</directory>
- <outputDirectory></outputDirectory>
- </fileSet>
-
- </fileSets>
-
-</component>
Copied: components/pc/trunk/portal/src/assemble/simple-portal-war-jboss51.xml (from rev
49, components/pc/trunk/portal/src/assemble/simple-portal-war-jboss50.xml)
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-war-jboss51.xml
(rev 0)
+++ components/pc/trunk/portal/src/assemble/simple-portal-war-jboss51.xml 2009-08-25
19:58:54 UTC (rev 56)
@@ -0,0 +1,12 @@
+<component>
+
+ <fileSets>
+
+ <fileSet>
+ <directory>src/main/resources/jboss50</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+
+ </fileSets>
+
+</component>
Copied: components/pc/trunk/portal/src/main/resources/jboss51 (from rev 49,
components/pc/trunk/portal/src/main/resources/jboss50)
Modified: components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
===================================================================
---
components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2009-08-25
19:52:10 UTC (rev 55)
+++
components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2009-08-25
19:58:54 UTC (rev 56)
@@ -47,7 +47,7 @@
<url-pattern>*.jsp</url-pattern>
</filter-mapping>
<listener>
-<!--
<listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
-->
+<!--
<listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
-->
<listener-class>org.gatein.pc.portal.exo.kernel.KernelListener</listener-class>
</listener>
<servlet>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2009-08-25 19:52:10 UTC (rev 55)
+++ components/pc/trunk/test/pom.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -197,6 +197,7 @@
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -211,11 +212,13 @@
</execution>
</executions>
<configuration>
- <!--<jpda>false</jpda>-->
- <!--<jpdaPort>9000</jpdaPort>-->
- <!--<jpdaSuspend>true</jpdaSuspend>-->
- <!--<failOnError>false</failOnError>-->
- <!--<assertions>true</assertions>-->
+ <!--
+ <jpda>true</jpda>
+ <jpdaPort>9000</jpdaPort>
+ <jpdaSuspend>true</jpdaSuspend>
+ <failOnError>false</failOnError>
+ <assertions>true</assertions>
+ -->
<testsuites>
<testsuite>
<config>test/local-jboss-unit.xml</config>
Modified: components/pc/trunk/test/src/test/build.xml
===================================================================
--- components/pc/trunk/test/src/test/build.xml 2009-08-25 19:52:10 UTC (rev 55)
+++ components/pc/trunk/test/src/test/build.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -76,7 +76,7 @@
</path>
<path id="portal-web-shared">
- <pathelement path="${dependency.portal-web-web.jar}"/>
+ <pathelement path="${dependency.gatein-wci-wci.jar}"/>
</path>
<path id="portal-portlet">
@@ -88,7 +88,7 @@
<path id="portal-portlet-shared">
<path location="${dependency.gatein-pc-pc.jar}"/>
<path location="${dependency.gatein-pc-api.jar}"/>
- <path location="${dependency.gatein-jsr168api.jar}"/>
+ <path location="${dependency.jsr168api.jar}"/>
</path>
<path id="exo">
@@ -130,7 +130,7 @@
<path location="${dependency.ccpp.jar}"/>
</path>
- <path id="jboss-5.0">
+ <path id="jboss-5.1">
<path refid="portal-common"/>
<path refid="portal-web"/>
<path refid="portal-portlet"/>
@@ -138,7 +138,7 @@
<path location="${dependency.jboss-common-core.jar}"/>
</path>
- <path id="jboss-5.0-shared">
+ <path id="jboss-5.1-shared">
<path refid="portal-common-shared"/>
<path refid="portal-web-shared"/>
<path refid="portal-portlet-shared"/>
@@ -208,46 +208,22 @@
<property environment="env"/>
<!--If properties are not in command line check if they are set in env-->
- <condition property="JBOSS_4_2_1_HOME"
value="${env.JBOSS_4_2_1_HOME}">
+ <condition property="JBOSS_4_2_HOME"
value="${env.JBOSS_4_2_HOME}">
<and>
- <isset property="env.JBOSS_4_2_1_HOME"/>
+ <isset property="env.JBOSS_4_2_HOME"/>
<not>
- <isset property="JBOSS_4_2_1_HOME"/>
+ <isset property="JBOSS_4_2_HOME"/>
</not>
</and>
</condition>
- <condition property="JBOSS_4_2_2_HOME"
value="${env.JBOSS_4_2_2_HOME}">
+ <condition property="JBOSS_5_1_HOME"
value="${env.JBOSS_5_1_HOME}">
<and>
- <isset property="env.JBOSS_4_2_2_HOME"/>
+ <isset property="env.JBOSS_5_1_HOME"/>
<not>
- <isset property="JBOSS_4_2_2_HOME"/>
+ <isset property="JBOSS_5_1_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"/>
- <not>
- <isset property="JBOSS_4_2_0_HOME"/>
- </not>
- </and>
- </condition>
- <condition property="JBOSS_4_2_3_HOME"
value="${env.JBOSS_4_2_3_HOME}">
- <and>
- <isset property="env.JBOSS_4_2_3_HOME"/>
- <not>
- <isset property="JBOSS_4_2_3_HOME"/>
- </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"/>
@@ -265,11 +241,8 @@
</and>
</condition>
- <echo message="JBOSS_4_2_0_HOME: ${JBOSS_4_2_0_HOME}"/>
- <echo message="JBOSS_4_2_1_HOME: ${JBOSS_4_2_1_HOME}"/>
- <echo message="JBOSS_4_2_2_HOME: ${JBOSS_4_2_2_HOME}"/>
- <echo message="JBOSS_4_2_3_HOME: ${JBOSS_4_2_3_HOME}"/>
- <echo message="JBOSS_5_0_HOME: ${JBOSS_5_0_HOME}"/>
+ <echo message="JBOSS_4_2_HOME: ${JBOSS_4_2_HOME}"/>
+ <echo message="JBOSS_5_1_HOME: ${JBOSS_5_1_HOME}"/>
<echo message="TOMCAT_6_0_HOME: ${TOMCAT_6_0_HOME}"/>
<echo message="JETTY_6_1_HOME: ${JETTY_6_1_HOME}"/>
</target>
@@ -299,33 +272,24 @@
</target>
<target name="__evaluate_properties.jboss">
- <fail message="Please set the environment variables JBOSS_4_2_0_HOME,
JBOSS_4_2_1_HOME, JBOSS_4_2_2_HOME and JBOSS_4_2_3_HOME">
+ <fail message="Please set the environment variables
JBOSS_4_2_HOME">
<condition>
<and>
<not>
- <isset property="JBOSS_4_2_0_HOME"/>
+ <isset property="JBOSS_4_2_HOME"/>
</not>
- <not>
- <isset property="JBOSS_4_2_1_HOME"/>
- </not>
- <not>
- <isset property="JBOSS_4_2_2_HOME"/>
- </not>
- <not>
- <isset property="JBOSS_4_2_3_HOME"/>
- </not>
</and>
</condition>
</fail>
- <!--<fail message="Please set the environment variable
JBOSS_5_0_HOME">
+ <fail message="Please set the environment variable
JBOSS_5_1_HOME">
<condition>
<and>
<not>
- <isset property="JBOSS_5_0_HOME"/>
+ <isset property="JBOSS_5_1_HOME"/>
</not>
</and>
</condition>
- </fail>-->
+ </fail>
</target>
<target name="__evaluate_properties.local">
@@ -540,18 +504,18 @@
<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">
+ <!-- JBoss 5.1 portlet-test.war -->
+ <copy todir="${test.temp.dir}/jboss-5.1/portlet-test-war">
<fileset dir="${target}/test-classes/portlet-test-war"/>
- <fileset
dir="${target}/test-classes/jboss-5.0/portlet-test-war"/>
+ <fileset
dir="${target}/test-classes/jboss-5.1/portlet-test-war"/>
</copy>
- <copy todir="${test.temp.dir}/jboss-5.0/portlet-test-war/WEB-INF/lib"
flatten="true">
+ <copy todir="${test.temp.dir}/jboss-5.1/portlet-test-war/WEB-INF/lib"
flatten="true">
<fileset dir="${test.temp.lib}"
includes="portlet-test-lib.jar"/>
- <path refid="jboss-5.0"/>
+ <path refid="jboss-5.1"/>
</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">
+ <mkdir dir="${test.temp.lib}/jboss-5.1"/>
+ <jar jarfile="${test.temp.lib}/jboss-5.1/portlet-test.war">
+ <fileset dir="${test.temp.dir}/jboss-5.1/portlet-test-war">
<exclude name="**/jboss-kernel*.jar"/>
</fileset>
</jar>
@@ -644,7 +608,7 @@
</cargo>
</target>
- <target name="__tests.jboss-4.2.container-servlet"
if="${test.jboss-4.2.home.variable-name}">
+ <target name="tests.jboss-4.2.container-servlet"
if="${test.jboss-4.2.home.variable-name}">
<echo message="Starting JBoss 4.2 container-servlet tests with
${test.jboss-4.2.home}"/>
<antcall target="__cargo.jboss-4.2.start">
<param name="cargo.wait" value="false"/>
@@ -658,7 +622,7 @@
</antcall>
</target>
- <target name="__tests.jboss-4.2.generic"
if="${test.jboss-4.2.home.variable-name}">
+ <target name="tests.jboss-4.2.generic"
if="${test.jboss-4.2.home.variable-name}">
<echo message="Starting JBoss 4.2 generic tests with
${test.jboss-4.2.home}"/>
<antcall target="__cargo.jboss-4.2.start">
<param name="cargo.wait" value="false"/>
@@ -672,54 +636,17 @@
</antcall>
</target>
- <target name="__tests.jboss-4.2.0" if="JBOSS_4_2_0_HOME">
- <antcall target="__tests.jboss-4.2.container-servlet">
- <param name="test.id"
value="JBoss-4_2_0-container-servlet"/>
- <param name="test.jboss-4.2.name"
value="RemoteJBoss_4_2_0"/>
- <param name="test.jboss-4.2.home"
value="${JBOSS_4_2_0_HOME}"/>
- <param name="test.jboss-4.2.home.variable-name"
value="JBOSS_4_2_0_HOME"/>
- <param name="test.jboss-4.2.tempdir"
value="${target}/cargo-tmp/4_2_0"/>
+ <target name="tests.jboss-4.2" if="JBOSS_4_2_HOME">
+ <antcall target="tests.jboss-4.2.container-servlet">
+ <param name="test.id"
value="JBoss-4_2-container-servlet"/>
+ <param name="test.jboss-4.2.name"
value="RemoteJBoss_4_2"/>
+ <param name="test.jboss-4.2.home"
value="${JBOSS_4_2_HOME}"/>
+ <param name="test.jboss-4.2.home.variable-name"
value="JBOSS_4_2_HOME"/>
+ <param name="test.jboss-4.2.tempdir"
value="${target}/cargo-tmp/4_2"/>
</antcall>
</target>
- <target name="__tests.jboss-4.2.1" if="JBOSS_4_2_1_HOME">
- <antcall target="__tests.jboss-4.2.container-servlet">
- <param name="test.id"
value="JBoss-4_2_1-container-servlet"/>
- <param name="test.jboss-4.2.name"
value="RemoteJBoss_4_2_1"/>
- <param name="test.jboss-4.2.home"
value="${JBOSS_4_2_1_HOME}"/>
- <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>
- </target>
-
- <target name="__tests.jboss-4.2.2" if="JBOSS_4_2_2_HOME">
- <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-4.2.3" if="JBOSS_4_2_3_HOME">
- <antcall target="__tests.jboss-4.2.container-servlet">
- <param name="test.id"
value="JBoss-4_2_3-container-servlet"/>
- <param name="test.jboss-4.2.name"
value="RemoteJBoss_4_2_3"/>
- <param name="test.jboss-4.2.home"
value="${JBOSS_4_2_3_HOME}"/>
- <param name="test.jboss-4.2.home.variable-name"
value="JBOSS_4_2_3_HOME"/>
- <param name="test.jboss-4.2.tempdir"
value="${target}/cargo-tmp/4_2_3"/>
- </antcall>
- </target>
-
- <target name="tests.jboss-4.2">
- <antcall target="__tests.jboss-4.2.0"/>
- <antcall target="__tests.jboss-4.2.1"/>
- <antcall target="__tests.jboss-4.2.2"/>
- <antcall target="__tests.jboss-4.2.3"/>
- </target>
-
- <target name="__cargo.jboss-5.0.start"
depends="__cargo.setup">
+ <target name="__cargo.jboss-5.1.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
@@ -727,12 +654,12 @@
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}"/>
+ <property name="jboss-5.1-shared-property"
refid="jboss-5.1-shared"/>
+ <echo message="jboss-5.1-shared : ${jboss-5.1-shared-property}"/>
<cargo
- containerId="jboss5x"
- home="${test.jboss-5.0.home}"
+ containerId="jboss51x"
+ home="${test.jboss-5.1.home}"
log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
output="${cargo.log.dir}/cargo.${test.id}.server.log"
action="start"
@@ -740,74 +667,74 @@
<!--<sysproperty key="java.io.tmpdir"
value="${target}/cargo-tmp"/>-->
<sharedClasspath>
- <path refid="jboss-5.0-shared"/>
+ <path refid="jboss-5.1-shared"/>
<path refid="exo"/>
</sharedClasspath>
- <configuration home="${test.jboss-5.0.tempdir}">
+ <configuration home="${test.jboss-5.1.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"/>
+ <deployable type="war"
file="${test.temp.lib}/jboss-5.1/portlet-test.war"/>
</configuration>
</cargo>
</target>
- <target name="__cargo.jboss-5.0.stop"
depends="__cargo.setup">
+ <target name="__cargo.jboss-5.1.stop"
depends="__cargo.setup">
<cargo
- containerId="jboss5x"
- home="${test.jboss-5.0.home}"
+ containerId="jboss51x"
+ home="${test.jboss-5.1.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}">
+ <configuration home="${test.jboss-5.1.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">
+ <target name="tests.jboss-5.1.container-servlet"
if="${test.jboss-5.1.home.variable-name}">
+ <echo message="Starting JBoss 5.1 container-servlet tests with
${test.jboss-5.1.home}"/>
+ <antcall target="__cargo.jboss-5.1.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"/>
+ <param name="test.server.name"
value="${test.jboss-5.1.name}"/>
+ <param name="test.deploy.name"
value="jboss-5.1-container-servlet"/>
</antcall>
- <antcall target="__cargo.jboss-5.0.stop">
+ <antcall target="__cargo.jboss-5.1.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">
+ <target name="tests.jboss-5.1.generic"
if="${test.jboss-5.1.home.variable-name}">
+ <echo message="Starting JBoss 5.1 generic tests with
${test.jboss-5.1.home}"/>
+ <antcall target="__cargo.jboss-5.1.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"/>
+ <param name="test.server.name"
value="${test.jboss-5.1.name}"/>
+ <param name="test.deploy.name"
value="jboss-5.1-generic"/>
</antcall>
- <antcall target="__cargo.jboss-5.0.stop">
+ <antcall target="__cargo.jboss-5.1.stop">
</antcall>
</target>
- <target name="tests.jboss-5.0" if="JBOSS_5_0_HOME">
- <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"/>
+ <target name="tests.jboss-5.1" if="JBOSS_5_1_HOME">
+ <antcall target="tests.jboss-5.1.container-servlet">
+ <param name="test.id"
value="JBoss-5_1-container-servlet"/>
+ <param name="test.jboss-5.1.name"
value="RemoteJBoss_5_1"/>
+ <param name="test.jboss-5.1.home"
value="${JBOSS_5_1_HOME}"/>
+ <param name="test.jboss-5.1.home.variable-name"
value="JBOSS_5_1_HOME"/>
+ <param name="test.jboss-5.1.tempdir"
value="${target}/cargo-tmp/5_1"/>
</antcall>
</target>
<target name="tests.jboss">
<antcall target="tests.jboss-4.2"/>
- <!-- <antcall target="tests.jboss-5.0"/> -->
+ <antcall target="tests.jboss-5.1"/>
</target>
<target name="tests.local">
@@ -830,6 +757,7 @@
output="${cargo.log.dir}/cargo.${test.id}.server.log"
log="${cargo.log.dir}/cargo.${test.id}.start.log"
action="start"
+ timeout="180000"
wait="${cargo.wait}">
<sharedClasspath>
@@ -1020,12 +948,12 @@
<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"/>
+ <fileset
dir="${target}/test-classes/jboss-5.1/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"/>
+ <path refid="jboss-5.1"/>
</copy>
<mkdir dir="${tck-jboss5}/tck-portal"/>
@@ -1037,7 +965,7 @@
</jar>
<copy todir="${tck-jboss5}/tck-portal" flatten="true">
- <path refid="jboss-5.0-shared"/>
+ <path refid="jboss-5.1-shared"/>
</copy>
<!--TOMCAT-->
Copied: components/pc/trunk/test/src/test/resources/jboss-5.1 (from rev 49,
components/pc/trunk/test/src/test/resources/jboss-5.0)
Modified:
components/pc/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml
===================================================================
---
components/pc/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml 2009-08-25
19:52:10 UTC (rev 55)
+++
components/pc/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml 2009-08-25
19:58:54 UTC (rev 56)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
-
<listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
+
<listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>PortalServlet</servlet-name>
Modified:
components/pc/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml
===================================================================
---
components/pc/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml 2009-08-25
19:52:10 UTC (rev 55)
+++
components/pc/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml 2009-08-25
19:58:54 UTC (rev 56)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
-
<listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
+
<listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>PortalServlet</servlet-name>
Modified: components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2009-08-25
19:52:10 UTC (rev 55)
+++ components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2009-08-25
19:58:54 UTC (rev 56)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
-
<listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
+
<listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>exoint</servlet-name>
Modified: components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml
===================================================================
---
components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2009-08-25
19:52:10 UTC (rev 55)
+++
components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2009-08-25
19:58:54 UTC (rev 56)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
-
<listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
+
<listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>exoint</servlet-name>
Modified: components/pc/trunk/test/src/test/resources/test/servers.xml
===================================================================
--- components/pc/trunk/test/src/test/resources/test/servers.xml 2009-08-25 19:52:10 UTC
(rev 55)
+++ components/pc/trunk/test/src/test/resources/test/servers.xml 2009-08-25 19:58:54 UTC
(rev 56)
@@ -44,7 +44,7 @@
</node>
</server>
<server>
- <server-name>RemoteJBoss_4_2_0</server-name>
+ <server-name>RemoteJBoss_4_2</server-name>
<node>
<node-id>default</node-id>
<service>
@@ -62,7 +62,7 @@
</node>
</server>
<server>
- <server-name>RemoteJBoss_4_2_1</server-name>
+ <server-name>RemoteJBoss_5_1</server-name>
<node>
<node-id>default</node-id>
<service>
@@ -72,60 +72,6 @@
</service>
<deployer>
<remote>
- <name>jboss4x</name>
- <host>localhost</host>
- <port>8080</port>
- </remote>
- </deployer>
- </node>
- </server>
- <server>
- <server-name>RemoteJBoss_4_2_2</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>jboss4x</name>
- <host>localhost</host>
- <port>8080</port>
- </remote>
- </deployer>
- </node>
- </server>
- <server>
- <server-name>RemoteJBoss_4_2_3</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>jboss4x</name>
- <host>localhost</host>
- <port>8080</port>
- </remote>
- </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>