[richfaces-svn-commits] JBoss Rich Faces SVN: r15914 - in branches/sandbox/3.3.X_JSF2/test-applications: ajaxTest and 16 other directories.

Author: Alex.Kolonitsky Date: 2009-11-18 05:21:55 -0500 (Wed, 18 Nov 2009) New Revision: 15914 Modified: branches/sandbox/3.3.X_JSF2/test-applications/ajaxTest/pom.xml branches/sandbox/3.3.X_JSF2/test-applications/automator/pom.xml branches/sandbox/3.3.X_JSF2/test-applications/facelets/pom.xml branches/sandbox/3.3.X_JSF2/test-applications/jsp/pom.xml branches/sandbox/3.3.X_JSF2/test-applications/pom.xml branches/sandbox/3.3.X_JSF2/test-applications/regression-test/pom.xml branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/pom.xml branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/regressionArea-ear/pom.xml branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/regressionArea-ejb/pom.xml branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/regressionArea-tests/pom.xml branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/regressionArea-web/pom.xml branches/sandbox/3.3.X_JSF2/test-applications/richfaces-docs/pom.xml branches/sandbox/3.3.X_JSF2/test-applications/seamApp/pom.xml branches/sandbox/3.3.X_JSF2/test-applications/selenium-testing-lib/pom.xml branches/sandbox/3.3.X_JSF2/test-applications/seleniumTest/pom.xml branches/sandbox/3.3.X_JSF2/test-applications/seleniumTest/richfaces/pom.xml branches/sandbox/3.3.X_JSF2/test-applications/seleniumTest/samples/pom.xml branches/sandbox/3.3.X_JSF2/test-applications/test-jsp/pom.xml Log: change version to 3.3.3-jsf2 Modified: branches/sandbox/3.3.X_JSF2/test-applications/ajaxTest/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/ajaxTest/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/ajaxTest/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -55,7 +55,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>jsf-test</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3-jsf2-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> @@ -66,7 +66,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3-jsf2-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.el</groupId> @@ -102,4 +102,4 @@ <version>1.2_12</version> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: branches/sandbox/3.3.X_JSF2/test-applications/automator/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/automator/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/automator/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3-jsf2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -27,4 +27,4 @@ </exclusions> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: branches/sandbox/3.3.X_JSF2/test-applications/facelets/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/facelets/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/facelets/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3-jsf2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -32,4 +32,4 @@ <version>1.1.15.B1</version> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: branches/sandbox/3.3.X_JSF2/test-applications/jsp/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/jsp/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/jsp/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3-jsf2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -27,4 +27,4 @@ <scope>provided</scope> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: branches/sandbox/3.3.X_JSF2/test-applications/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3-jsf2-SNAPSHOT</version> <relativePath>../samples</relativePath> </parent> @@ -50,11 +50,11 @@ <groupId>org.richfaces</groupId> <artifactId>test-applications</artifactId> <packaging>pom</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3-jsf2-SNAPSHOT</version> <name>RichFaces Test Applications</name> <properties> - <rfVersion>3.3.3-SNAPSHOT</rfVersion> + <rfVersion>3.3.3-jsf2-SNAPSHOT</rfVersion> </properties> <modules> @@ -173,4 +173,4 @@ </dependencies> </profile> </profiles> -</project> \ No newline at end of file +</project> Modified: branches/sandbox/3.3.X_JSF2/test-applications/regression-test/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/regression-test/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/regression-test/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -5,7 +5,7 @@ <artifactId>regression-test</artifactId> <name>Regression test application</name> <packaging>war</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3-jsf2-SNAPSHOT</version> <description>Application for manual testing of regressions.</description> <url>http://www.jboss.org/richfaces</url> <inceptionYear>2009</inceptionYear> Modified: branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -1,115 +1,115 @@ -<?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"> - <modelVersion>4.0.0</modelVersion> - <!--parent> - <groupId>org.richfaces</groupId> - <artifactId>samples</artifactId> - <version>3.3.3-SNAPSHOT</version> - </parent--> - <groupId>org.richfaces.test-applications</groupId> - <artifactId>regressionArea</artifactId> - <packaging>pom</packaging> - <version>3.3.3-SNAPSHOT</version> - <name>Regresion Area:Seam Application</name> - <repositories> - <repository> - <releases/> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - <id>maven-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url>http://download.java.net/maven/1</url> - <layout>legacy</layout> - </repository> - <repository> - <releases/> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - <id>repository.jboss.org</id> - <url>http://repository.jboss.org/maven2</url> - </repository> - <repository> - <id>openqa</id> - <name>OpenQA Repository</name> - <url>http://archiva.openqa.org/repository/releases</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>openqa-snapshots</id> - <name>OpenQA Snapshots Repository</name> - <url>http://archiva.openqa.org/repository/snapshots</url> - <layout>default</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> - <properties> - <contextroot>regressionArea</contextroot> - <earname>regressionArea-ear</earname> - <richversion>3.3.3-SNAPSHOT</richversion> - <seamversion>2.1.1.GA</seamversion> - <jsfversion>1.2_11</jsfversion> - <jbosshome>C:/tmp/jboss-4.2.3.GA</jbosshome> - <jbosscontext>default</jbosscontext> - </properties> - <modules> - <module>regressionArea-ejb</module> - <module>regressionArea-web</module> - <module>regressionArea-ear</module> - <module>regressionArea-tests</module> - </modules> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.5</version> - <configuration> - <wtpmanifest>true</wtpmanifest> - <wtpapplicationxml>true</wtpapplicationxml> - <wtpversion>2.0</wtpversion> - <manifest> - ${basedir}/src/main/resources/META-INF/MANIFEST.MF - </manifest> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </configuration> - </plugin> - </plugins> - </build> - <profiles> - <profile> - <id>seam2.0</id> - <properties> - <seamversion>2.0.2.SP1</seamversion> - </properties> - </profile> - </profiles> -</project> \ No newline at end of file +<?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"> + <modelVersion>4.0.0</modelVersion> + <!--parent> + <groupId>org.richfaces</groupId> + <artifactId>samples</artifactId> + <version>3.3.3-jsf2-SNAPSHOT</version> + </parent--> + <groupId>org.richfaces.test-applications</groupId> + <artifactId>regressionArea</artifactId> + <packaging>pom</packaging> + <version>3.3.3-jsf2-SNAPSHOT</version> + <name>Regresion Area:Seam Application</name> + <repositories> + <repository> + <releases/> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <id>maven-repository.dev.java.net</id> + <name>Java.net Repository for Maven</name> + <url>http://download.java.net/maven/1</url> + <layout>legacy</layout> + </repository> + <repository> + <releases/> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <id>repository.jboss.org</id> + <url>http://repository.jboss.org/maven2</url> + </repository> + <repository> + <id>openqa</id> + <name>OpenQA Repository</name> + <url>http://archiva.openqa.org/repository/releases</url> + <layout>default</layout> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>openqa-snapshots</id> + <name>OpenQA Snapshots Repository</name> + <url>http://archiva.openqa.org/repository/snapshots</url> + <layout>default</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + </repositories> + <properties> + <contextroot>regressionArea</contextroot> + <earname>regressionArea-ear</earname> + <richversion>3.3.3-jsf2-SNAPSHOT</richversion> + <seamversion>2.1.1.GA</seamversion> + <jsfversion>1.2_11</jsfversion> + <jbosshome>C:/tmp/jboss-4.2.3.GA</jbosshome> + <jbosscontext>default</jbosscontext> + </properties> + <modules> + <module>regressionArea-ejb</module> + <module>regressionArea-web</module> + <module>regressionArea-ear</module> + <module>regressionArea-tests</module> + </modules> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <version>2.5</version> + <configuration> + <wtpmanifest>true</wtpmanifest> + <wtpapplicationxml>true</wtpapplicationxml> + <wtpversion>2.0</wtpversion> + <manifest> + ${basedir}/src/main/resources/META-INF/MANIFEST.MF + </manifest> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </configuration> + </plugin> + </plugins> + </build> + <profiles> + <profile> + <id>seam2.0</id> + <properties> + <seamversion>2.0.2.SP1</seamversion> + </properties> + </profile> + </profiles> +</project> Modified: branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/regressionArea-ear/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/regressionArea-ear/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/regressionArea-ear/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -6,9 +6,9 @@ <parent> <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3-jsf2-SNAPSHOT</version> </parent> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3-jsf2-SNAPSHOT</version> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>regressionArea-ear</artifactId> <name>Regression Area Ear Module</name> Modified: branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/regressionArea-ejb/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/regressionArea-ejb/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/regressionArea-ejb/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3-jsf2-SNAPSHOT</version> </parent> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>regressionArea-ejb</artifactId> Modified: branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/regressionArea-tests/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/regressionArea-tests/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/regressionArea-tests/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -1,105 +1,105 @@ -<?xml version="1.0"?><project> - <parent> - <artifactId>regressionArea</artifactId> - <groupId>org.richfaces.test-applications</groupId> - <version>3.3.3-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.test-applications.regressionArea</groupId> - <artifactId>regressionArea-tests</artifactId> - <packaging>jar</packaging> - <name>Regression Area Tests</name> - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.8</version> - <scope>test</scope> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.8</version> - <scope>test</scope> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> - <version>${richversion}</version> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>${richversion}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> - <version>${richversion}</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>${jsfversion}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.openqa.selenium.client-drivers</groupId> - <artifactId>selenium-java-client-driver</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.openqa.selenium.server</groupId> - <artifactId>selenium-server-coreless</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>jetty</groupId> - <artifactId>org.mortbay.jetty</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - <configuration> - - <!-- Skip the normal tests, we'll run them in the integration-test phase --> - <skip>true</skip> - <suiteXmlFiles> - <suiteXmlFile> - src/test/resources/testng.xml - </suiteXmlFile> - </suiteXmlFiles> - </configuration> - <executions> - <execution> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file +<?xml version="1.0"?><project> + <parent> + <artifactId>regressionArea</artifactId> + <groupId>org.richfaces.test-applications</groupId> + <version>3.3.3-jsf2-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.test-applications.regressionArea</groupId> + <artifactId>regressionArea-tests</artifactId> + <packaging>jar</packaging> + <name>Regression Area Tests</name> + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.8</version> + <scope>test</scope> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.8</version> + <scope>test</scope> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>${richversion}</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${richversion}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>${richversion}</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>${jsfversion}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.openqa.selenium.client-drivers</groupId> + <artifactId>selenium-java-client-driver</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.openqa.selenium.server</groupId> + <artifactId>selenium-server-coreless</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>jetty</groupId> + <artifactId>org.mortbay.jetty</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + + <!-- Skip the normal tests, we'll run them in the integration-test phase --> + <skip>true</skip> + <suiteXmlFiles> + <suiteXmlFile> + src/test/resources/testng.xml + </suiteXmlFile> + </suiteXmlFiles> + </configuration> + <executions> + <execution> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> +</project> Modified: branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/regressionArea-web/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/regressionArea-web/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/regressionArea/regressionArea-web/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3-jsf2-SNAPSHOT</version> </parent> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>regressionArea-web</artifactId> Modified: branches/sandbox/3.3.X_JSF2/test-applications/richfaces-docs/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/richfaces-docs/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/richfaces-docs/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -1,232 +1,232 @@ -<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.docs.richfaces</groupId> - <artifactId>richfaces-docs</artifactId> - <packaging>war</packaging> - <name>richfaces-docs Maven Webapp</name> - <version>1</version> - <build> - <finalName>richfaces-docs</finalName> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - - <pluginRepositories> - <pluginRepository> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - <id>repository.jboss.com</id> - <name>Jboss Repository for Maven</name> - <url>http://repository.jboss.com/maven2/</url> - <layout>default</layout> - </pluginRepository> - <pluginRepository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>snapshots.jboss.org</id> - <name>Jboss Snapshots Repository for Maven</name> - <url>http://snapshots.jboss.org/maven2/</url> - <layout>default</layout> - </pluginRepository> - </pluginRepositories> - <repositories> - <repository> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - </snapshots> - <id>snapshots.jboss.org</id> - <name>Snapshot Jboss Repository for Maven</name> - <url>http://snapshots.jboss.org/maven2/</url> - <layout>default</layout> - </repository> - <repository> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - </snapshots> - <id>repository.jboss.com</id> - <name>Jboss Repository for Maven</name> - <url>http://repository.jboss.com/maven2/</url> - <layout>default</layout> - </repository> - </repositories> -<dependencies> - - <dependency> - - <groupId>junit</groupId> - - <artifactId>junit</artifactId> - - <version>3.8.1</version> - - <scope>test</scope> - - </dependency> - - <dependency> - - <groupId>javax.servlet</groupId> - - <artifactId>servlet-api</artifactId> - - <version>2.4</version> - - <scope>provided</scope> - - </dependency> - - <dependency> - - <groupId>javax.servlet</groupId> - - <artifactId>jsp-api</artifactId> - - <version>2.0</version> - - <scope>provided</scope> - - </dependency> - - <dependency> - - <groupId>jstl</groupId> - - <artifactId>jstl</artifactId> - - <version>1.1.2</version> - - </dependency> - - <dependency> - - <groupId>javax.servlet.jsp</groupId> - - <artifactId>jsp-api</artifactId> - - <version>2.1</version> - - <scope>provided</scope> - - </dependency> - - <dependency> - - <groupId>javax.faces</groupId> - - <artifactId>jsf-api</artifactId> - - <version>1.2_12</version> - - </dependency> - - <dependency> - - <groupId>javax.faces</groupId> - - <artifactId>jsf-impl</artifactId> - - <version>1.2_12</version> - - </dependency> - - <dependency> - - <groupId>javax.el</groupId> - - <artifactId>el-api</artifactId> - - <version>1.0</version> - - <scope>provided</scope> - - </dependency> - - <dependency> - - <groupId>el-impl</groupId> - - <artifactId>el-impl</artifactId> - - <version>1.0</version> - - <scope>provided</scope> - - </dependency> - - <dependency> - - <groupId>javax.annotation</groupId> - - <artifactId>jsr250-api</artifactId> - - <version>1.0</version> - - </dependency> - - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.11</version> - </dependency> - - - <!-- RichFaces libraries --> - - <dependency> - - <groupId>org.richfaces.framework</groupId> - - <artifactId>richfaces-api</artifactId> - - <version>3.3.3-SNAPSHOT</version> - - </dependency> - - <dependency> - - <groupId>org.richfaces.framework</groupId> - - <artifactId>richfaces-impl</artifactId> - - <version>3.3.3-SNAPSHOT</version> - - </dependency> - - <dependency> - - <groupId>org.richfaces.ui</groupId> - - <artifactId>richfaces-ui</artifactId> - - <version>3.3.3-SNAPSHOT</version> - - </dependency> - -</dependencies> -</project> +<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.docs.richfaces</groupId> + <artifactId>richfaces-docs</artifactId> + <packaging>war</packaging> + <name>richfaces-docs Maven Webapp</name> + <version>1</version> + <build> + <finalName>richfaces-docs</finalName> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + + <pluginRepositories> + <pluginRepository> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <id>repository.jboss.com</id> + <name>Jboss Repository for Maven</name> + <url>http://repository.jboss.com/maven2/</url> + <layout>default</layout> + </pluginRepository> + <pluginRepository> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + <id>snapshots.jboss.org</id> + <name>Jboss Snapshots Repository for Maven</name> + <url>http://snapshots.jboss.org/maven2/</url> + <layout>default</layout> + </pluginRepository> + </pluginRepositories> + <repositories> + <repository> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + </snapshots> + <id>snapshots.jboss.org</id> + <name>Snapshot Jboss Repository for Maven</name> + <url>http://snapshots.jboss.org/maven2/</url> + <layout>default</layout> + </repository> + <repository> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + </snapshots> + <id>repository.jboss.com</id> + <name>Jboss Repository for Maven</name> + <url>http://repository.jboss.com/maven2/</url> + <layout>default</layout> + </repository> + </repositories> +<dependencies> + + <dependency> + + <groupId>junit</groupId> + + <artifactId>junit</artifactId> + + <version>3.8.1</version> + + <scope>test</scope> + + </dependency> + + <dependency> + + <groupId>javax.servlet</groupId> + + <artifactId>servlet-api</artifactId> + + <version>2.4</version> + + <scope>provided</scope> + + </dependency> + + <dependency> + + <groupId>javax.servlet</groupId> + + <artifactId>jsp-api</artifactId> + + <version>2.0</version> + + <scope>provided</scope> + + </dependency> + + <dependency> + + <groupId>jstl</groupId> + + <artifactId>jstl</artifactId> + + <version>1.1.2</version> + + </dependency> + + <dependency> + + <groupId>javax.servlet.jsp</groupId> + + <artifactId>jsp-api</artifactId> + + <version>2.1</version> + + <scope>provided</scope> + + </dependency> + + <dependency> + + <groupId>javax.faces</groupId> + + <artifactId>jsf-api</artifactId> + + <version>1.2_12</version> + + </dependency> + + <dependency> + + <groupId>javax.faces</groupId> + + <artifactId>jsf-impl</artifactId> + + <version>1.2_12</version> + + </dependency> + + <dependency> + + <groupId>javax.el</groupId> + + <artifactId>el-api</artifactId> + + <version>1.0</version> + + <scope>provided</scope> + + </dependency> + + <dependency> + + <groupId>el-impl</groupId> + + <artifactId>el-impl</artifactId> + + <version>1.0</version> + + <scope>provided</scope> + + </dependency> + + <dependency> + + <groupId>javax.annotation</groupId> + + <artifactId>jsr250-api</artifactId> + + <version>1.0</version> + + </dependency> + + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.11</version> + </dependency> + + + <!-- RichFaces libraries --> + + <dependency> + + <groupId>org.richfaces.framework</groupId> + + <artifactId>richfaces-api</artifactId> + + <version>3.3.3-jsf2-SNAPSHOT</version> + + </dependency> + + <dependency> + + <groupId>org.richfaces.framework</groupId> + + <artifactId>richfaces-impl</artifactId> + + <version>3.3.3-jsf2-SNAPSHOT</version> + + </dependency> + + <dependency> + + <groupId>org.richfaces.ui</groupId> + + <artifactId>richfaces-ui</artifactId> + + <version>3.3.3-jsf2-SNAPSHOT</version> + + </dependency> + +</dependencies> +</project> Modified: branches/sandbox/3.3.X_JSF2/test-applications/seamApp/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/seamApp/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/seamApp/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -8,7 +8,7 @@ <name>sample application</name> <properties> <projectName>seamApp</projectName> - <rfVersion>3.3.3-SNAPSHOT</rfVersion> + <rfVersion>3.3.3-jsf2-SNAPSHOT</rfVersion> <seamVersion>2.1.0.SP1</seamVersion> <jbossDownloadURL>http://downloads.sourceforge.net/jboss/jboss-4.2.2.GA... <jbossDeployDir>jboss-4.2.2.GA/jboss-4.2.2.GA/server/default/</jbossDeployDir> @@ -96,4 +96,4 @@ </pluginManagement> </build> -</project> \ No newline at end of file +</project> Modified: branches/sandbox/3.3.X_JSF2/test-applications/selenium-testing-lib/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/selenium-testing-lib/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/selenium-testing-lib/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -1,144 +1,144 @@ -<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.jboss.test</groupId> - <artifactId>selenium</artifactId> - <packaging>jar</packaging> - <version>1.0-SNAPSHOT</version> - <name>selenium-testing-lib</name> - <url>http://maven.apache.org</url> - - <scm> - <developerConnection> - scm:svn:https://svn.jboss.org/repos/richfaces/branches/community/3.3.X/te... - </developerConnection> - </scm> - -<distributionManagement> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> - </snapshotRepository> - </distributionManagement> - - - <repositories> - <repository> - <id>openqa</id> - <name>OpenQA Repository</name> - <url>http://archiva.openqa.org/repository/releases</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>source-jar</id> - <phase>install</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>javadoc-jar</id> - <phase>install</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-install-plugin</artifactId> - <executions> - <execution> - <id>install-sources</id> - <phase>install</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> - <version>${version}</version> - <packaging>jar</packaging> - <file>${project.build.directory}/${artifactId}-${version}-sources.jar</file> - <classifier>sources</classifier> - </configuration> - </execution> - <execution> - <id>install-javadoc</id> - <phase>install</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> - <version>${version}</version> - <packaging>jar</packaging> - <file>${project.build.directory}/${artifactId}-${version}-javadoc.jar</file> - <classifier>javadoc</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.8</version> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium.client-drivers</groupId> - <artifactId>selenium-java-client-driver</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium.server</groupId> - <artifactId>selenium-server-coreless</artifactId> - <version>1.0.1</version> - <exclusions> - <exclusion> - <groupId>jetty</groupId> - <artifactId>org.mortbay.jetty</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - </dependency> - </dependencies> -</project> +<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.jboss.test</groupId> + <artifactId>selenium</artifactId> + <packaging>jar</packaging> + <version>1.0-SNAPSHOT</version> + <name>selenium-testing-lib</name> + <url>http://maven.apache.org</url> + + <scm> + <developerConnection> + scm:svn:https://svn.jboss.org/repos/richfaces/branches/community/3.3.X/te... + </developerConnection> + </scm> + +<distributionManagement> + <snapshotRepository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshot Repository</name> + <url>dav:https://snapshots.jboss.org/maven2</url> + </snapshotRepository> + </distributionManagement> + + + <repositories> + <repository> + <id>openqa</id> + <name>OpenQA Repository</name> + <url>http://archiva.openqa.org/repository/releases</url> + <layout>default</layout> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + </repositories> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>source-jar</id> + <phase>install</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>javadoc-jar</id> + <phase>install</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-install-plugin</artifactId> + <executions> + <execution> + <id>install-sources</id> + <phase>install</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <groupId>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <version>${version}</version> + <packaging>jar</packaging> + <file>${project.build.directory}/${artifactId}-${version}-sources.jar</file> + <classifier>sources</classifier> + </configuration> + </execution> + <execution> + <id>install-javadoc</id> + <phase>install</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <groupId>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <version>${version}</version> + <packaging>jar</packaging> + <file>${project.build.directory}/${artifactId}-${version}-javadoc.jar</file> + <classifier>javadoc</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.8</version> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium.client-drivers</groupId> + <artifactId>selenium-java-client-driver</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium.server</groupId> + <artifactId>selenium-server-coreless</artifactId> + <version>1.0.1</version> + <exclusions> + <exclusion> + <groupId>jetty</groupId> + <artifactId>org.mortbay.jetty</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + </dependency> + </dependencies> +</project> Modified: branches/sandbox/3.3.X_JSF2/test-applications/seleniumTest/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/seleniumTest/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/seleniumTest/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -1,254 +1,254 @@ -<?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"> - <parent> - <artifactId>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>seleniumTest</groupId> - <artifactId>seleniumTest</artifactId> - <packaging>pom</packaging> - <name>SeleniumTest</name> - <version>3.3.3-SNAPSHOT</version> - <url>http://maven.apache.org</url> - <properties> - <http.port>8085</http.port> - </properties> - <repositories> - <repository> - <id>nexus-openqa</id> - <name>OpenQA Repository</name> - <url>http://nexus.openqa.org/content/repositories/releases</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>nexus-openqa-snapshots</id> - <name>OpenQA Snapshots Repository</name> - <url>http://nexus.openqa.org/content/repositories/snapshots</url> - <layout>default</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - <repository> - <id>maven-2-repository.dev.java.net</id> - <url>http://download.java.net/maven/2</url> - </repository> - </repositories> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Xmx256m</argLine> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> - <version>0.3.1</version> - <dependencies></dependencies> - <configuration> - <wait>false</wait> - <container> - <containerId>jetty6x</containerId> - <dependencies> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </dependency> - <dependency> - <groupId>el-impl</groupId> - <artifactId>el-impl</artifactId> - </dependency> - </dependencies> - <type>embedded</type> - </container> - <configuration> - <properties> - <cargo.servlet.port> - ${http.port} - </cargo.servlet.port> - </properties> - </configuration> - </configuration> - <executions> - <execution> - <id>start-container</id> - <phase>pre-integration-test</phase> - <goals> - <goal>start</goal> - </goals> - </execution> - <execution> - <id>stop-container</id> - <phase>post-integration-test</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <profiles> - <profile> - <id>linux</id> - <activation> - <os> - <family>unix</family> - </os> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>selenium-maven-plugin</artifactId> - <version>1.0-beta-2</version> - <executions> - <!--execution> - <id>xvfb</id> - <phase>pre-integration-test</phase> - <goals> - <goal>xvfb</goal> - </goals> - </execution--> - - <execution> - <phase>pre-integration-test</phase> - <goals> - <goal>start-server</goal> - </goals> - <configuration> - <background>true</background> - <debug>false</debug> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - <testResources> - <testResource> - <directory>src/test/testng/unix</directory> - <targetPath>testng</targetPath> - <filtering>true</filtering> - </testResource> - </testResources> - </build> - </profile> - <profile> - <id>windows</id> - <activation> - <os> - <family>windows</family> - </os> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>selenium-maven-plugin</artifactId> - <version>1.0-beta-2</version> - <executions> - <!-- - <execution> - <phase>pre-integration-test</phase> - <goals> - <goal>start-server</goal> - </goals> - <configuration> - <background>true</background> - <debug>false</debug> - </configuration> - </execution> - --> - </executions> - </plugin> - </plugins> - <testResources> - <testResource> - <directory>src/test/testng/win</directory> - <targetPath>testng</targetPath> - <filtering>true</filtering> - </testResource> - </testResources> - </build> - </profile> - </profiles> - <modules> - <module>richfaces</module> - <module>samples</module> - </modules> - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.8</version> - <scope>test</scope> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.8</version> - <scope>test</scope> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium.core</groupId> - <artifactId>selenium-core</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium.client-drivers</groupId> - <artifactId>selenium-java-client-driver</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium.server</groupId> - <artifactId>selenium-server-coreless</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>test</scope> - <!--exclusions> - <exclusion> - <groupId>jetty</groupId> - <artifactId>org.mortbay.jetty</artifactId> - </exclusion> - </exclusions--> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_12</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>3.1.0.CR1</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.4.2</version> - </dependency> - </dependencies> -</project> \ No newline at end of file +<?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"> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.3.3-jsf2-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>seleniumTest</groupId> + <artifactId>seleniumTest</artifactId> + <packaging>pom</packaging> + <name>SeleniumTest</name> + <version>3.3.3-jsf2-SNAPSHOT</version> + <url>http://maven.apache.org</url> + <properties> + <http.port>8085</http.port> + </properties> + <repositories> + <repository> + <id>nexus-openqa</id> + <name>OpenQA Repository</name> + <url>http://nexus.openqa.org/content/repositories/releases</url> + <layout>default</layout> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>nexus-openqa-snapshots</id> + <name>OpenQA Snapshots Repository</name> + <url>http://nexus.openqa.org/content/repositories/snapshots</url> + <layout>default</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + <repository> + <id>maven-2-repository.dev.java.net</id> + <url>http://download.java.net/maven/2</url> + </repository> + </repositories> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>-Xmx256m</argLine> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>0.3.1</version> + <dependencies></dependencies> + <configuration> + <wait>false</wait> + <container> + <containerId>jetty6x</containerId> + <dependencies> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </dependency> + <dependency> + <groupId>el-impl</groupId> + <artifactId>el-impl</artifactId> + </dependency> + </dependencies> + <type>embedded</type> + </container> + <configuration> + <properties> + <cargo.servlet.port> + ${http.port} + </cargo.servlet.port> + </properties> + </configuration> + </configuration> + <executions> + <execution> + <id>start-container</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start</goal> + </goals> + </execution> + <execution> + <id>stop-container</id> + <phase>post-integration-test</phase> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <profiles> + <profile> + <id>linux</id> + <activation> + <os> + <family>unix</family> + </os> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>selenium-maven-plugin</artifactId> + <version>1.0-beta-2</version> + <executions> + <!--execution> + <id>xvfb</id> + <phase>pre-integration-test</phase> + <goals> + <goal>xvfb</goal> + </goals> + </execution--> + + <execution> + <phase>pre-integration-test</phase> + <goals> + <goal>start-server</goal> + </goals> + <configuration> + <background>true</background> + <debug>false</debug> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + <testResources> + <testResource> + <directory>src/test/testng/unix</directory> + <targetPath>testng</targetPath> + <filtering>true</filtering> + </testResource> + </testResources> + </build> + </profile> + <profile> + <id>windows</id> + <activation> + <os> + <family>windows</family> + </os> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>selenium-maven-plugin</artifactId> + <version>1.0-beta-2</version> + <executions> + <!-- + <execution> + <phase>pre-integration-test</phase> + <goals> + <goal>start-server</goal> + </goals> + <configuration> + <background>true</background> + <debug>false</debug> + </configuration> + </execution> + --> + </executions> + </plugin> + </plugins> + <testResources> + <testResource> + <directory>src/test/testng/win</directory> + <targetPath>testng</targetPath> + <filtering>true</filtering> + </testResource> + </testResources> + </build> + </profile> + </profiles> + <modules> + <module>richfaces</module> + <module>samples</module> + </modules> + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.8</version> + <scope>test</scope> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.8</version> + <scope>test</scope> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium.core</groupId> + <artifactId>selenium-core</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium.client-drivers</groupId> + <artifactId>selenium-java-client-driver</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium.server</groupId> + <artifactId>selenium-server-coreless</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>test</scope> + <!--exclusions> + <exclusion> + <groupId>jetty</groupId> + <artifactId>org.mortbay.jetty</artifactId> + </exclusion> + </exclusions--> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>3.3.3-jsf2-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_12</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>3.1.0.CR1</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.4.2</version> + </dependency> + </dependencies> +</project> Modified: branches/sandbox/3.3.X_JSF2/test-applications/seleniumTest/richfaces/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/seleniumTest/richfaces/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/seleniumTest/richfaces/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -1,190 +1,190 @@ -<?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"> - <parent> - <groupId>seleniumTest</groupId> - <artifactId>seleniumTest</artifactId> - <version>3.3.3-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>seleniumTest</groupId> - <artifactId>richfaces</artifactId> - <packaging>war</packaging> - <name>seleniumTest Maven Webapp</name> - <version>3.3.3-SNAPSHOT</version> - <build> - <finalName>richfaces</finalName> - </build> - <properties> - <seamVersion>2.1.1.GA</seamVersion> - </properties> - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - <configuration> - <!-- Skip the normal tests, we'll run them in the integration-test phase --> - <skip>true</skip> - <suiteXmlFiles> - <!--suiteXmlFile> - ${project.build.directory}/test-classes/testng/testng_all_all_none.xml - </suiteXmlFile> - <suiteXmlFile> - ${project.build.directory}/test-classes/testng/testng_all_all_tidy.xml - </suiteXmlFile> - <suiteXmlFile> - ${project.build.directory}/test-classes/testng/testng_all_all_neko.xml - </suiteXmlFile> - <suiteXmlFile> - ${project.build.directory}/test-classes/testng/testng_all_default_none.xml - </suiteXmlFile> - <suiteXmlFile> - ${project.build.directory}/test-classes/testng/testng_all_default_none.xml - </suiteXmlFile> - <suiteXmlFile> - ${project.build.directory}/test-classes/testng/testng_all_default_none.xml - </suiteXmlFile> - <suiteXmlFile> - ${project.build.directory}/test-classes/testng/testng_default_all_none.xml - </suiteXmlFile> - <suiteXmlFile> - ${project.build.directory}/test-classes/testng/testng_default_all_none.xml - </suiteXmlFile> - <suiteXmlFile> - ${project.build.directory}/test-classes/testng/testng_default_all_none.xml - </suiteXmlFile> - <suiteXmlFile> - ${project.build.directory}/test-classes/testng/testng_default_default_none.xml - </suiteXmlFile> - <suiteXmlFile> - ${project.build.directory}/test-classes/testng/testng_default_default_none.xml - </suiteXmlFile> - <suiteXmlFile> - ${project.build.directory}/test-classes/testng/testng_default_default_neko.xml - </suiteXmlFile--> - <suiteXmlFile> - src/test/testng/win/local_testng.xml - </suiteXmlFile> - </suiteXmlFiles> - <properties> - <property> - <name>listener</name> - <value>org.richfaces.TestAnnotationTransformer</value> - </property> - </properties> - </configuration> - <executions> - <execution> - <phase>integration-test</phase> - <goals> - <!--goal>test</goal--> - </goals> - <configuration> - <skip>false</skip> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>hudson</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - <configuration> - <!-- Skip the normal tests, we'll run them in the integration-test phase --> - <skip>true</skip> - <suiteXmlFiles> - <suiteXmlFile>${suiteXmlFile}</suiteXmlFile> - <!-- - <suiteXmlFile> - src/test/testng/hudson/testng-failures.xml - </suiteXmlFile> - <suiteXmlFile> - src/test/testng/hudson/testng.xml - </suiteXmlFile> - --> - </suiteXmlFiles> - <properties> - <property> - <name>listener</name> - <value>org.richfaces.TestAnnotationTransformer</value> - </property> - </properties> - </configuration> - <executions> - <execution> - <phase>integration-test</phase> - <configuration> - <skip>false</skip> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <dependencies> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <version>${seamVersion}</version> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</artifactId> - <version>${seamVersion}</version> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.6.0.GA</version> - </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - <repositories> - <repository> - <releases/> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - <id>repository.jboss.org</id> - <url>http://repository.jboss.org/maven2</url> - </repository> - <repository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>snapshots.jboss.org</id> - <url>http://snapshots.jboss.org/maven2</url> - </repository> - </repositories> -</project> +<?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"> + <parent> + <groupId>seleniumTest</groupId> + <artifactId>seleniumTest</artifactId> + <version>3.3.3-jsf2-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>seleniumTest</groupId> + <artifactId>richfaces</artifactId> + <packaging>war</packaging> + <name>seleniumTest Maven Webapp</name> + <version>3.3.3-jsf2-SNAPSHOT</version> + <build> + <finalName>richfaces</finalName> + </build> + <properties> + <seamVersion>2.1.1.GA</seamVersion> + </properties> + <profiles> + <profile> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <!-- Skip the normal tests, we'll run them in the integration-test phase --> + <skip>true</skip> + <suiteXmlFiles> + <!--suiteXmlFile> + ${project.build.directory}/test-classes/testng/testng_all_all_none.xml + </suiteXmlFile> + <suiteXmlFile> + ${project.build.directory}/test-classes/testng/testng_all_all_tidy.xml + </suiteXmlFile> + <suiteXmlFile> + ${project.build.directory}/test-classes/testng/testng_all_all_neko.xml + </suiteXmlFile> + <suiteXmlFile> + ${project.build.directory}/test-classes/testng/testng_all_default_none.xml + </suiteXmlFile> + <suiteXmlFile> + ${project.build.directory}/test-classes/testng/testng_all_default_none.xml + </suiteXmlFile> + <suiteXmlFile> + ${project.build.directory}/test-classes/testng/testng_all_default_none.xml + </suiteXmlFile> + <suiteXmlFile> + ${project.build.directory}/test-classes/testng/testng_default_all_none.xml + </suiteXmlFile> + <suiteXmlFile> + ${project.build.directory}/test-classes/testng/testng_default_all_none.xml + </suiteXmlFile> + <suiteXmlFile> + ${project.build.directory}/test-classes/testng/testng_default_all_none.xml + </suiteXmlFile> + <suiteXmlFile> + ${project.build.directory}/test-classes/testng/testng_default_default_none.xml + </suiteXmlFile> + <suiteXmlFile> + ${project.build.directory}/test-classes/testng/testng_default_default_none.xml + </suiteXmlFile> + <suiteXmlFile> + ${project.build.directory}/test-classes/testng/testng_default_default_neko.xml + </suiteXmlFile--> + <suiteXmlFile> + src/test/testng/win/local_testng.xml + </suiteXmlFile> + </suiteXmlFiles> + <properties> + <property> + <name>listener</name> + <value>org.richfaces.TestAnnotationTransformer</value> + </property> + </properties> + </configuration> + <executions> + <execution> + <phase>integration-test</phase> + <goals> + <!--goal>test</goal--> + </goals> + <configuration> + <skip>false</skip> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>hudson</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <!-- Skip the normal tests, we'll run them in the integration-test phase --> + <skip>true</skip> + <suiteXmlFiles> + <suiteXmlFile>${suiteXmlFile}</suiteXmlFile> + <!-- + <suiteXmlFile> + src/test/testng/hudson/testng-failures.xml + </suiteXmlFile> + <suiteXmlFile> + src/test/testng/hudson/testng.xml + </suiteXmlFile> + --> + </suiteXmlFiles> + <properties> + <property> + <name>listener</name> + <value>org.richfaces.TestAnnotationTransformer</value> + </property> + </properties> + </configuration> + <executions> + <execution> + <phase>integration-test</phase> + <configuration> + <skip>false</skip> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + <dependencies> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <version>${seamVersion}</version> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</artifactId> + <version>${seamVersion}</version> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.6.0.GA</version> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0</version> + </dependency> + </dependencies> + <repositories> + <repository> + <releases/> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <id>repository.jboss.org</id> + <url>http://repository.jboss.org/maven2</url> + </repository> + <repository> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + <id>snapshots.jboss.org</id> + <url>http://snapshots.jboss.org/maven2</url> + </repository> + </repositories> +</project> Modified: branches/sandbox/3.3.X_JSF2/test-applications/seleniumTest/samples/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/seleniumTest/samples/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/seleniumTest/samples/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -5,13 +5,13 @@ <parent> <groupId>seleniumTest</groupId> <artifactId>seleniumTest</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3-jsf2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>seleniumTest</groupId> <artifactId>samples</artifactId> <name>Samples</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3-jsf2-SNAPSHOT</version> <build> <finalName>seleniumTest</finalName> <plugins> @@ -88,4 +88,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> Modified: branches/sandbox/3.3.X_JSF2/test-applications/test-jsp/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/test-applications/test-jsp/pom.xml 2009-11-18 10:20:04 UTC (rev 15913) +++ branches/sandbox/3.3.X_JSF2/test-applications/test-jsp/pom.xml 2009-11-18 10:21:55 UTC (rev 15914) @@ -1,30 +1,30 @@ -<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"> - <parent> - <artifactId>test-applications</artifactId> - <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.test-applications</groupId> - <artifactId>test-jsp</artifactId> - <packaging>war</packaging> - <name>RichFaces Test Application (TEST-JSP)</name> - <build> - <finalName>richfaces-test-jsp</finalName> - </build> -<dependencies> - <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>1.0.b2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> -</dependencies> -</project> \ No newline at end of file +<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"> + <parent> + <artifactId>test-applications</artifactId> + <groupId>org.richfaces</groupId> + <version>3.3.3-jsf2-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.test-applications</groupId> + <artifactId>test-jsp</artifactId> + <packaging>war</packaging> + <name>RichFaces Test Application (TEST-JSP)</name> + <build> + <finalName>richfaces-test-jsp</finalName> + </build> +<dependencies> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.0.b2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> +</dependencies> +</project>