Author: lfryc(a)redhat.com Date: 2010-07-10 16:48:37 -0400 (Sat, 10 Jul 2010) New Revision: 17864 Added: root/tests/metamer/trunk/ftest/cli.sh Removed: root/tests/metamer/trunk/ftest/profiles.jboss-qa.xml root/tests/metamer/trunk/ftest/profiles.xml Modified: root/tests/metamer/trunk/ftest/pom.xml Log: preparation for hudson integration testing Added: root/tests/metamer/trunk/ftest/cli.sh =================================================================== --- root/tests/metamer/trunk/ftest/cli.sh (rev 0) +++ root/tests/metamer/trunk/ftest/cli.sh 2010-07-10 20:48:37 UTC (rev 17864) @@ -0,0 +1,2 @@ +#!/bin/bash +mvn cli:execute-phase Modified: root/tests/metamer/trunk/ftest/pom.xml =================================================================== --- root/tests/metamer/trunk/ftest/pom.xml 2010-07-10 20:48:22 UTC (rev 17863) +++ root/tests/metamer/trunk/ftest/pom.xml 2010-07-10 20:48:37 UTC (rev 17864) @@ -1,71 +1,102 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.tests</groupId> - <artifactId>testapp</artifactId> - <version>4.0.0-SNAPSHOT</version> - <packaging>jar</packaging> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.tests</groupId> + <artifactId>testapp-tests</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>jar</packaging> - <parent> - <artifactId>functional-test-jboss-ci-template</artifactId> - <groupId>org.jboss.test.richfaces-selenium</groupId> - <version>1.5.0-SNAPSHOT</version> - </parent> + <parent> + <artifactId>functional-test-jboss-ci-template</artifactId> + <groupId>org.jboss.test.richfaces-selenium</groupId> + <version>1.5.0-SNAPSHOT</version> + </parent> - <properties> - <context.path>/testapp</context.path> - </properties> + <properties> + <context.path>/testapp</context.path> + <deployable.version>4.0.0-SNAPSHOT</deployable.version> + <deployable.classifier>tomcat6</deployable.classifier> + <tomcat6x.installer.url.unix>file:/qa/home/lfryc/apache-tomcat-6.0.26--jsf2.zip</tomcat6x.installer.url.unix> + <container.dir.deflatted>apache-tomcat-6.0.26--jsf2</container.dir.deflatted> + </properties> - <repositories> - <repository> - <id>jboss-public-repository-group</id> - <name>Jboss Repository for Maven</name> - <url>https://repository.jboss.org/nexus/content/groups/public/</url> - </repository> - </repositories> + <repositories> + <repository> + <id>jboss-public-repository-group</id> + <name>Jboss Repository for Maven</name> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> + </repository> + </repositories> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>functional-test</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile> - </suiteXmlFiles> - <properties> - <property> - <name>listener</name> - <value>org.jboss.test.selenium.listener.ConsoleStatusTestListener</value> - </property> - </properties> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <dependencies> + <dependency> + <groupId>org.richfaces.examples</groupId> + <artifactId>testapp</artifactId> + <type>${deployable.type}</type> + <version>${deployable.version}</version> + <classifier>${deployable.classifier}</classifier> + </dependency> + </dependencies> - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.10</version> - <classifier>jdk15</classifier> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test</groupId> - <artifactId>richfaces-selenium</artifactId> - <version>1.5.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> + <profiles> + <profile> + <id>deploy-artifact</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <configuration> + <deployer> + <type>installed</type> + <deployables> + <deployable> + <groupId>org.richfaces.examples</groupId> + <artifactId>testapp</artifactId> + <classifier>${deployable.classifier}</classifier> + <type>${deployable.type}</type> + <properties> + <context>${context.deploy.path}</context> + </properties> + </deployable> + </deployables> + </deployer> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <executions> + <execution> + <id>functional-test</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile> + </suiteXmlFiles> + <properties> + <property> + <name>listener</name> + <value>org.jboss.test.selenium.listener.ConsoleStatusTestListener</value> + </property> + </properties> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Deleted: root/tests/metamer/trunk/ftest/profiles.jboss-qa.xml =================================================================== --- root/tests/metamer/trunk/ftest/profiles.jboss-qa.xml 2010-07-10 20:48:22 UTC (rev 17863) +++ root/tests/metamer/trunk/ftest/profiles.jboss-qa.xml 2010-07-10 20:48:37 UTC (rev 17864) @@ -1,216 +0,0 @@ -<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/settings-1.0.0.xsd"> - - <activeProfiles> - <activeProfile>container-installation</activeProfile> - </activeProfiles> - - <profiles> - <!-- This is used by JBoss RichFaces QA --> - <profile> - <id>profile-test-not-empty</id> - <activation> - <property> - <name>profile.test</name> - <value>!</value> - </property> - </activation> - <properties> - <test>${profile.test}</test> - </properties> - </profile> - <profile> - <id>profile-demo-version-not-empty</id> - <activation> - <property> - <name>profile.demo.version</name> - <value>!</value> - </property> - </activation> - <properties> - <demo.version>${profile.demo.version}</demo.version> - </properties> - </profile> - <!-- INTERNET EXPLORER PROFILE --> - <profile> - <id>browser-internet-explorer</id> - <activation> - <os> - <family>windows</family> - </os> - <property> - <name>profile.browser</name> - <value>internet-explorer</value> - </property> - </activation> - <properties> - <browser>*piiexplore</browser> - </properties> - </profile> - <!-- FIREFOX_VERSION --> - <profile> - <id>browser-firefox-2</id> - <activation> - <property> - <name>profile.browser</name> - <value>firefox-2</value> - </property> - </activation> - <properties> - <browser.version>2.0.0.20</browser.version> - <browser>${browser.firefox}</browser> - </properties> - </profile> - <profile> - <id>browser-firefox-3.0</id> - <activation> - <property> - <name>profile.browser</name> - <value>firefox-3.0</value> - </property> - </activation> - <properties> - <browser.version>3.0.14</browser.version> - <browser>${browser.firefox}</browser> - </properties> - </profile> - <profile> - <id>browser-firefox-3.5</id> - <activation> - <property> - <name>profile.browser</name> - <value>firefox-3.5</value> - </property> - </activation> - <properties> - <browser.version>3.5.3</browser.version> - <browser>${browser.firefox}</browser> - </properties> - </profile> - <!-- FIREFOX OS DENPENDENT --> - <profile> - <id>firefoxes-home-linux</id> - <activation> - <os> - <family>unix</family> - </os> - </activation> - <properties> - <firefoxes.home>/qa/tools/opt</firefoxes.home> - <browser.firefox>*firefox ${firefoxes.home}/firefox-${browser.version}/firefox-bin</browser.firefox> - </properties> - </profile> - <profile> - <id>firefoxes-home-windows</id> - <activation> - <os> - <family>windows</family> - </os> - </activation> - <properties> - <firefoxes.home>T:\opt\windows</firefoxes.home> - <browser.firefox>*firefox ${firefoxes.home}\firefox-${browser.version}\firefox.exe</browser.firefox> - </properties> - </profile> - <!-- CONTAINER INSTALLATION --> - <profile> - <id>container-installation</id> - <properties> - <jboss5x.version>5.1.0.GA</jboss5x.version> - <jboss5x.installer.url.unix>file:/qa/tools/src/jboss/jboss-${jboss5x.version}.zip</jboss5x.installer.url.unix> - <jboss5x.installer.url.windows>file:t:\src\jboss\jboss-${jboss5x.version}.GA.zip</jboss5x.installer.url.windows> - <jboss6x.version>6.0.0.M2</jboss6x.version> - <jboss6x.unflatted.dir>jboss-${jboss6x.version}</jboss6x.unflatted.dir> - <jboss6x.installer.url.unix>file:/qa/tools/src/jboss/jboss-${jboss6x.version}.zip</jboss6x.installer.url.unix> - <jboss6x.installer.url.windows>file:t:\src\jboss\jboss-${jboss6x.version}.zip</jboss6x.installer.url.windows> - <tomcat6x.version>6.0.24</tomcat6x.version> - <tomcat6x.installer.url.unix>file:/qa/tools/src/apache/apache-tomcat-${tomcat6x.version}.zip</tomcat6x.installer.url.unix> - <tomcat6x.installer.url.windows>file:t:\src\apache\apache-tomcat-${tomcat6x.version}.zip</tomcat6x.installer.url.windows> - </properties> - </profile> - <profile> - <id>container-tomcat6x-installation</id> - <activation> - <property> - <name>containerId</name> - <value>tomcat6x</value> - </property> - </activation> - <properties> - <container.version>${tomcat6x.version}</container.version> - <container.installer.url.unix>${tomcat6x.installer.url.unix}</container.installer.url.unix> - <container.installer.url.windows>${tomcat6x.installer.url.windows}</container.installer.url.windows> - </properties> - </profile> - <profile> - <id>container-jboss5x-installation</id> - <activation> - <property> - <name>containerId</name> - <value>jboss5x</value> - </property> - </activation> - <properties> - <container.version>${jboss5x.version}</container.version> - <container.installer.url.unix>${jboss5x.installer.url.unix}</container.installer.url.unix> - <container.installer.url.windows>${jboss5x.installer.url.windows}</container.installer.url.windows> - </properties> - </profile> - <profile> - <id>container-jboss6x-installation</id> - <activation> - <property> - <name>containerId</name> - <value>jboss6x</value> - </property> - </activation> - <properties> - <container.version>${jboss6x.version}</container.version> - <container.unflatted.dir>${jboss6x.unflatted.dir}</container.unflatted.dir> - <container.installer.url.unix>${jboss6x.installer.url.unix}</container.installer.url.unix> - <container.installer.url.windows>${jboss6x.installer.url.windows}</container.installer.url.windows> - </properties> - </profile> - <profile> - <id>container-installation-unix</id> - <activation> - <os> - <family>unix</family> - </os> - </activation> - <properties> - <container.installer.url>${container.installer.url.unix}</container.installer.url> - </properties> - </profile> - <profile> - <id>container-installation-windows</id> - <activation> - <os> - <family>windows</family> - </os> - </activation> - <properties> - <container.installer.url>${container.installer.url.windows}</container.installer.url> - </properties> - </profile> - <!-- REPOSITORIES CONFIGURATION --> - <profile> - <id>repository-exadel</id> - <repositories> - <repository> - <!-- used for RichFaces release testing --> - <id>repository.exadel.com</id> - <url>http://repository.exadel.com</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - </profile> - </profiles> -</profilesXml> Deleted: root/tests/metamer/trunk/ftest/profiles.xml =================================================================== --- root/tests/metamer/trunk/ftest/profiles.xml 2010-07-10 20:48:22 UTC (rev 17863) +++ root/tests/metamer/trunk/ftest/profiles.xml 2010-07-10 20:48:37 UTC (rev 17864) @@ -1,36 +0,0 @@ -<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/settings-1.0.0.xsd"> - <profiles> - <profile> - <id>localEnvironment</id> - <!-- set local environment specific properties here --> - <properties> - <!-- *** browser: the type of web browser (and path to its binary if needed) --> - <!--<browser>*firefox</browser>--> - <!--<browser>*firefox /usr/lib/firefox-3.5.2/firefox</browser>--> - <!--<browser>*chrome</browser>--> - <!--<browser>*chrome /usr/lib/firefox-3.5.2/firefox</browser>--> - <!--<browser>*iexplore</browser>--> - <!--<browser>*iexplore c:\\program files\\internet explorer\\iexplore.exe</browser>--> - <!--<browser>*konqueror /usr/bin/konqueror</browser>--> - <!--<browser>*safari</browser>--> - - <!--*** context.root: HTTP protocol URL to testing server ***--> - <!--<context.root>http://localhost:8080/</context.root>--> - - <!--*** context.path: Context root of application in context of server ***--> - <!--<context.path>/richfaces-demo</context.path>--> - - <!--*** selenium.port: specifies on which port should run selenium server (default: 8444) ***--> - <!--<selenium.port>8446</selenium.port>--> - - <!--*** firefoxProfileTemplate: specifies path to firefox's profile which should be used as template to create new session --> - <!--<firefoxProfileTemplate>/home/qa/.mozilla/firefox/87nmklfc.Testing</firefoxProfileTemplate>--> - </properties> - </profile> - </profiles> - <activeProfiles> - <activeProfile>localEnvironment</activeProfile> - </activeProfiles> -</profilesXml>