[weld-commits] Weld SVN: r5397 - in examples/trunk: jsf/login and 3 other directories.

Author: kpiwko(a)redhat.com Date: 2010-01-08 07:25:43 -0500 (Fri, 08 Jan 2010) New Revision: 5397 Modified: examples/trunk/jsf/login/pom.xml examples/trunk/jsf/numberguess/pom.xml examples/trunk/jsf/permalink/pom.xml examples/trunk/jsf/translator/ear/pom.xml examples/trunk/pom.xml Log: WELD-368 Modified: examples/trunk/jsf/login/pom.xml =================================================================== --- examples/trunk/jsf/login/pom.xml 2010-01-08 09:13:54 UTC (rev 5396) +++ examples/trunk/jsf/login/pom.xml 2010-01-08 12:25:43 UTC (rev 5397) @@ -77,13 +77,14 @@ </activation> <properties> + <ftest.artifact>ftest-login</ftest.artifact> <ftest.version>0.1${ftest.version.discriminator}</ftest.version> </properties> <dependencies> <dependency> <groupId>org.jboss.weld.examples.ftest</groupId> - <artifactId>ftest-login</artifactId> + <artifactId>${ftest.artifact}</artifactId> <version>${ftest.version}</version> <scope>test</scope> </dependency> @@ -92,6 +93,10 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> </plugin> @@ -100,6 +105,10 @@ <artifactId>selenium-maven-plugin</artifactId> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>failsafe-maven-plugin</artifactId> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> </plugin> @@ -113,13 +122,14 @@ </activation> <properties> + <ftest.artifact>ftest-login</ftest.artifact> <ftest.version>0.1${ftest.version.discriminator}</ftest.version> </properties> <dependencies> <dependency> <groupId>org.jboss.weld.examples.ftest</groupId> - <artifactId>ftest-login</artifactId> + <artifactId>${ftest.artifact}</artifactId> <version>${ftest.version}</version> <scope>test</scope> </dependency> @@ -128,6 +138,10 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> </plugin> @@ -136,13 +150,16 @@ <artifactId>selenium-maven-plugin</artifactId> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>failsafe-maven-plugin</artifactId> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> </plugin> </plugins> </build> </profile> - </profiles> </project> Modified: examples/trunk/jsf/numberguess/pom.xml =================================================================== --- examples/trunk/jsf/numberguess/pom.xml 2010-01-08 09:13:54 UTC (rev 5396) +++ examples/trunk/jsf/numberguess/pom.xml 2010-01-08 12:25:43 UTC (rev 5397) @@ -439,6 +439,7 @@ </build> </profile> + <!-- functional tests --> <profile> <id>ftest-jboss-remote-51</id> <activation> @@ -446,13 +447,14 @@ </activation> <properties> + <ftest.artifact>ftest-numberguess</ftest.artifact> <ftest.version>0.1${ftest.version.discriminator}</ftest.version> </properties> <dependencies> <dependency> <groupId>org.jboss.weld.examples.ftest</groupId> - <artifactId>ftest-numberguess</artifactId> + <artifactId>${ftest.artifact}</artifactId> <version>${ftest.version}</version> <scope>test</scope> </dependency> @@ -461,6 +463,10 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> </plugin> @@ -469,6 +475,10 @@ <artifactId>selenium-maven-plugin</artifactId> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>failsafe-maven-plugin</artifactId> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> </plugin> @@ -482,13 +492,14 @@ </activation> <properties> + <ftest.artifact>ftest-numberguess</ftest.artifact> <ftest.version>0.1${ftest.version.discriminator}</ftest.version> </properties> <dependencies> <dependency> <groupId>org.jboss.weld.examples.ftest</groupId> - <artifactId>ftest-numberguess</artifactId> + <artifactId>${ftest.artifact}</artifactId> <version>${ftest.version}</version> <scope>test</scope> </dependency> @@ -497,6 +508,10 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> </plugin> @@ -505,6 +520,10 @@ <artifactId>selenium-maven-plugin</artifactId> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>failsafe-maven-plugin</artifactId> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> </plugin> Modified: examples/trunk/jsf/permalink/pom.xml =================================================================== --- examples/trunk/jsf/permalink/pom.xml 2010-01-08 09:13:54 UTC (rev 5396) +++ examples/trunk/jsf/permalink/pom.xml 2010-01-08 12:25:43 UTC (rev 5397) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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"> +<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> <parent> @@ -424,7 +425,8 @@ <artifactId>maven-jetty-plugin</artifactId> <configuration> <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <connector + implementation="org.mortbay.jetty.nio.SelectChannelConnector"> <port>${jetty.http.port}</port> <maxIdleTime>3600000</maxIdleTime> </connector> @@ -442,7 +444,6 @@ </build> </profile> - <profile> <id>ftest-jboss-remote-51</id> <activation> @@ -450,13 +451,14 @@ </activation> <properties> + <ftest.artifact>ftest-permalink</ftest.artifact> <ftest.version>0.1${ftest.version.discriminator}</ftest.version> </properties> <dependencies> <dependency> <groupId>org.jboss.weld.examples.ftest</groupId> - <artifactId>ftest-permalink</artifactId> + <artifactId>${ftest.artifact}</artifactId> <version>${ftest.version}</version> <scope>test</scope> </dependency> @@ -465,6 +467,10 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> </plugin> @@ -473,13 +479,16 @@ <artifactId>selenium-maven-plugin</artifactId> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>failsafe-maven-plugin</artifactId> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> </plugin> </plugins> </build> </profile> - <profile> <id>ftest-jboss-remote-60</id> <activation> @@ -487,13 +496,14 @@ </activation> <properties> + <ftest.artifact>ftest-permalink</ftest.artifact> <ftest.version>0.1${ftest.version.discriminator}</ftest.version> </properties> <dependencies> <dependency> <groupId>org.jboss.weld.examples.ftest</groupId> - <artifactId>ftest-permalink</artifactId> + <artifactId>${ftest.artifact}</artifactId> <version>${ftest.version}</version> <scope>test</scope> </dependency> @@ -502,6 +512,10 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> </plugin> @@ -510,6 +524,10 @@ <artifactId>selenium-maven-plugin</artifactId> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>failsafe-maven-plugin</artifactId> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> </plugin> @@ -532,9 +550,10 @@ <!-- <executions> <execution> <id>touch-web-inf</id> <phase>validate</phase> <configuration> <tasks> - <touch file="${webapp.directory}/WEB-INF/web.xml" /> - </tasks> </configuration> <goals> <goal>run</goal> - </goals> </execution> </executions> + <touch file="${webapp.directory}/WEB-INF/web.xml" + /> </tasks> </configuration> <goals> + <goal>run</goal> </goals> </execution> + </executions> --> </plugin> </plugins> Modified: examples/trunk/jsf/translator/ear/pom.xml =================================================================== --- examples/trunk/jsf/translator/ear/pom.xml 2010-01-08 09:13:54 UTC (rev 5396) +++ examples/trunk/jsf/translator/ear/pom.xml 2010-01-08 12:25:43 UTC (rev 5397) @@ -65,13 +65,14 @@ </activation> <properties> + <ftest.artifact>ftest-translator</ftest.artifact> <ftest.version>0.1${ftest.version.discriminator}</ftest.version> </properties> <dependencies> <dependency> <groupId>org.jboss.weld.examples.ftest</groupId> - <artifactId>ftest-translator</artifactId> + <artifactId>${ftest.artifact}</artifactId> <version>${ftest.version}</version> <scope>test</scope> </dependency> @@ -80,6 +81,10 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> </plugin> @@ -88,6 +93,10 @@ <artifactId>selenium-maven-plugin</artifactId> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>failsafe-maven-plugin</artifactId> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> </plugin> @@ -101,13 +110,14 @@ </activation> <properties> + <ftest.artifact>ftest-translator</ftest.artifact> <ftest.version>0.1${ftest.version.discriminator}</ftest.version> </properties> <dependencies> <dependency> <groupId>org.jboss.weld.examples.ftest</groupId> - <artifactId>ftest-translator</artifactId> + <artifactId>${ftest.artifact}</artifactId> <version>${ftest.version}</version> <scope>test</scope> </dependency> @@ -116,6 +126,10 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> </plugin> @@ -124,13 +138,16 @@ <artifactId>selenium-maven-plugin</artifactId> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>failsafe-maven-plugin</artifactId> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> </plugin> </plugins> </build> </profile> - </profiles> Modified: examples/trunk/pom.xml =================================================================== --- examples/trunk/pom.xml 2010-01-08 09:13:54 UTC (rev 5396) +++ examples/trunk/pom.xml 2010-01-08 12:25:43 UTC (rev 5397) @@ -99,6 +99,7 @@ <selenium.maven.plugin.version>1.0</selenium.maven.plugin.version> <cargo.maven2.plugin.version>1.0</cargo.maven2.plugin.version> <maven.antrun.plugin.version>1.3</maven.antrun.plugin.version> + <failsafe.maven.plugin.version>2.4.3-alpha-1</failsafe.maven.plugin.version> <ant.junit.version>1.6.2</ant.junit.version> <ftest.version.discriminator></ftest.version.discriminator> <selenium.browser>*firefoxproxy</selenium.browser> @@ -289,12 +290,37 @@ <build> <pluginManagement> <plugins> - <!-- deploy war/ear file to container --> + <!-- get functional tests from ftest artifact --> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-ftest</id> + <phase>process-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/ftest</outputDirectory> + <stripVersion>true</stripVersion> + <artifactItems> + <artifactItem> + <groupId>org.jboss.weld.examples.ftest</groupId> + <artifactId>${ftest.artifact}</artifactId> + <overWrite>true</overWrite> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + + <!-- deploy/undeploy application archive to/from container --> + <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> <version>${cargo.maven2.plugin.version}</version> - <configuration> <container> <containerId>jboss5x</containerId> @@ -304,7 +330,6 @@ <type>runtime</type> </configuration> </configuration> - <executions> <execution> <id>deploy</id> @@ -313,7 +338,6 @@ <goal>deploy</goal> </goals> </execution> - <execution> <id>undeploy</id> <phase>post-integration-test</phase> @@ -323,6 +347,7 @@ </execution> </executions> </plugin> + <!-- start Selenium server --> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -341,10 +366,10 @@ </configuration> </execution> <!-- - this can't be used until plugin send the + this can't be used until plugin sends the right command, using Ant GET instead --> - <!-- + <!-- <execution> <id>stop-selenium</id> <phase>post-integration-test</phase> <goals> <goal>stop-server</goal> </goals> @@ -355,70 +380,77 @@ </executions> </plugin> - <!-- launch tests --> + <!-- run functional tests --> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>failsafe-maven-plugin</artifactId> + <version>${failsafe.maven.plugin.version}</version> + <configuration> + <testClassesDirectory>${project.build.directory}/ftest</testClassesDirectory> + <suiteXmlFiles> + <suiteXmlFile>src/test/selenium/${ftest.testsuite}</suiteXmlFile> + </suiteXmlFiles> + <argLine>-Xmx748m</argLine> + <forkMode>once</forkMode> + <systemProperties> + <property> + <name>selenium.server.port</name> + <value>${selenium.server.port}</value> + </property> + <property> + <name>selenium.server.host</name> + <value>${selenium.server.host}</value> + </property> + <property> + <name>selenium.browser</name> + <value>${selenium.browser}</value> + </property> + <property> + <name>selenium.browser.url</name> + <value>${selenium.browser.url}</value> + </property> + <property> + <name>selenium.speed</name> + <value>${selenium.speed}</value> + </property> + <property> + <name>selenium.timeout</name> + <value>${selenium.timeout}</value> + </property> + <property> + <name>basedir</name> + <value>${basedir}</value> + </property> + </systemProperties> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <phase>integration-test</phase> + <goals> + <goal>integration-test</goal> + </goals> + </execution> + <execution> + <id>verify</id> + <phase>verify</phase> + <goals> + <goal>verify</goal> + </goals> + </execution> + </executions> + </plugin> + + + <!-- stop Selenium --> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>${maven.antrun.plugin.version}</version> - <!-- generate JUnit like report --> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - <version>${ant.junit.version}</version> - </dependency> - </dependencies> - <executions> <!-- this ant script runs testng natively --> <execution> - <id>testng</id> - <phase>integration-test</phase> - <configuration> - <tasks> - <taskdef resource="testngtasks" - classpath="testng.jar" classpathref="maven.test.classpath" /> - <testng classpathref="maven.test.classpath" - outputdir="${project.build.directory}/test-reports" - haltonfailure="false"> - <xmlfileset dir="src/test/selenium" - includes="${ftest.testsuite}" /> - <sysproperty key="selenium.server.port" - value="${selenium.server.port}" /> - <sysproperty key="selenium.server.host" - value="${selenium.server.host}" /> - <sysproperty key="selenium.browser" - value="${selenium.browser}" /> - <sysproperty key="selenium.browser.url" - value="${selenium.browser.url}" /> - <sysproperty key="selenium.speed" - value="${selenium.speed}" /> - <sysproperty key="selenium.timeout" - value="${selenium.timeout}" /> - <sysproperty key="basedir" - value="${basedir}" /> - </testng> - - <junitreport - todir="${project.build.directory}/test-reports"> - <fileset - dir="${project.build.directory}/test-reports"> - <include name="**/*.xml" /> - <exclude name="**/*testng*.xml" /> - <exclude - name="**/TESTS-TestSuites.xml" /> - </fileset> - <report format="noframes" - todir="${project.build.directory}/test-reports" /> - </junitreport> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - <execution> <id>stop-selenium</id> <phase>post-integration-test</phase> <configuration> @@ -434,7 +466,7 @@ <goals> <goal>run</goal> </goals> - </execution> + </execution> </executions> </plugin> </plugins> @@ -477,12 +509,37 @@ <build> <pluginManagement> <plugins> - <!-- deploy war/ear file to container --> + <!-- get functional tests from ftest artifact --> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-ftest</id> + <phase>process-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/ftest</outputDirectory> + <stripVersion>true</stripVersion> + <artifactItems> + <artifactItem> + <groupId>org.jboss.weld.examples.ftest</groupId> + <artifactId>${ftest.artifact}</artifactId> + <overWrite>true</overWrite> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + + <!-- deploy/undeploy application archive to/from container --> + <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> <version>${cargo.maven2.plugin.version}</version> - <configuration> <container> <containerId>jboss5x</containerId> @@ -492,7 +549,6 @@ <type>runtime</type> </configuration> </configuration> - <executions> <execution> <id>deploy</id> @@ -501,7 +557,6 @@ <goal>deploy</goal> </goals> </execution> - <execution> <id>undeploy</id> <phase>post-integration-test</phase> @@ -511,6 +566,7 @@ </execution> </executions> </plugin> + <!-- start Selenium server --> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -529,7 +585,7 @@ </configuration> </execution> <!-- - this can't be used until plugin send the + this can't be used until plugin sends the right command, using Ant GET instead --> <!-- @@ -543,70 +599,77 @@ </executions> </plugin> - <!-- launch tests --> + <!-- run functional tests --> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>failsafe-maven-plugin</artifactId> + <version>${failsafe.maven.plugin.version}</version> + <configuration> + <testClassesDirectory>${project.build.directory}/ftest</testClassesDirectory> + <suiteXmlFiles> + <suiteXmlFile>src/test/selenium/${ftest.testsuite}</suiteXmlFile> + </suiteXmlFiles> + <argLine>-Xmx748m</argLine> + <forkMode>once</forkMode> + <systemProperties> + <property> + <name>selenium.server.port</name> + <value>${selenium.server.port}</value> + </property> + <property> + <name>selenium.server.host</name> + <value>${selenium.server.host}</value> + </property> + <property> + <name>selenium.browser</name> + <value>${selenium.browser}</value> + </property> + <property> + <name>selenium.browser.url</name> + <value>${selenium.browser.url}</value> + </property> + <property> + <name>selenium.speed</name> + <value>${selenium.speed}</value> + </property> + <property> + <name>selenium.timeout</name> + <value>${selenium.timeout}</value> + </property> + <property> + <name>basedir</name> + <value>${basedir}</value> + </property> + </systemProperties> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <phase>integration-test</phase> + <goals> + <goal>integration-test</goal> + </goals> + </execution> + <execution> + <id>verify</id> + <phase>verify</phase> + <goals> + <goal>verify</goal> + </goals> + </execution> + </executions> + </plugin> + + + <!-- stop Selenium --> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>${maven.antrun.plugin.version}</version> - <!-- generate JUnit like report --> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - <version>${ant.junit.version}</version> - </dependency> - </dependencies> - <executions> <!-- this ant script runs testng natively --> <execution> - <id>testng</id> - <phase>integration-test</phase> - <configuration> - <tasks> - <taskdef resource="testngtasks" - classpath="testng.jar" classpathref="maven.test.classpath" /> - <testng classpathref="maven.test.classpath" - outputdir="${project.build.directory}/test-reports" - haltonfailure="false"> - <xmlfileset dir="src/test/selenium" - includes="${ftest.testsuite}" /> - <sysproperty key="selenium.server.port" - value="${selenium.server.port}" /> - <sysproperty key="selenium.server.host" - value="${selenium.server.host}" /> - <sysproperty key="selenium.browser" - value="${selenium.browser}" /> - <sysproperty key="selenium.browser.url" - value="${selenium.browser.url}" /> - <sysproperty key="selenium.speed" - value="${selenium.speed}" /> - <sysproperty key="selenium.timeout" - value="${selenium.timeout}" /> - <sysproperty key="basedir" - value="${basedir}" /> - </testng> - - <junitreport - todir="${project.build.directory}/test-reports"> - <fileset - dir="${project.build.directory}/test-reports"> - <include name="**/*.xml" /> - <exclude name="**/*testng*.xml" /> - <exclude - name="**/TESTS-TestSuites.xml" /> - </fileset> - <report format="noframes" - todir="${project.build.directory}/test-reports" /> - </junitreport> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - <execution> <id>stop-selenium</id> <phase>post-integration-test</phase> <configuration>