[richfaces-svn-commits] JBoss Rich Faces SVN: r12138 - in trunk/test-applications/regressionArea: regressionArea-web and 1 other directory.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Tue Jan 6 11:53:20 EST 2009
Author: dsvyatobatsko
Date: 2009-01-06 11:53:19 -0500 (Tue, 06 Jan 2009)
New Revision: 12138
Modified:
trunk/test-applications/regressionArea/regressionArea-tests/pom.xml
trunk/test-applications/regressionArea/regressionArea-web/pom.xml
Log:
dependency refactoring started
Modified: trunk/test-applications/regressionArea/regressionArea-tests/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/regressionArea-tests/pom.xml 2009-01-06 16:35:18 UTC (rev 12137)
+++ trunk/test-applications/regressionArea/regressionArea-tests/pom.xml 2009-01-06 16:53:19 UTC (rev 12138)
@@ -9,7 +9,6 @@
<artifactId>regressionArea-tests</artifactId>
<packaging>jar</packaging>
<name>Regression Area Tests</name>
-
<dependencies>
<dependency>
<groupId>org.testng</groupId>
@@ -46,7 +45,6 @@
<version>1.2_11</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.openqa.selenium.client-drivers</groupId>
<artifactId>selenium-java-client-driver</artifactId>
@@ -66,35 +64,33 @@
</exclusions>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
+ <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>
+ <!-- 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>
@@ -106,5 +102,4 @@
</plugin>
</plugins>
</build>
-
</project>
\ No newline at end of file
Modified: trunk/test-applications/regressionArea/regressionArea-web/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/regressionArea-web/pom.xml 2009-01-06 16:35:18 UTC (rev 12137)
+++ trunk/test-applications/regressionArea/regressionArea-web/pom.xml 2009-01-06 16:53:19 UTC (rev 12138)
@@ -10,7 +10,6 @@
<artifactId>regressionArea-web</artifactId>
<name>Regression Area Web Module</name>
<packaging>war</packaging>
-
<dependencies>
<dependency>
<groupId>org.richfaces.framework</groupId>
@@ -44,46 +43,12 @@
<version>1.2_11</version>
<scope>provided</scope>
</dependency>
- <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.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>
- <dependency>
+ <dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>1.1.14</version>
</dependency>
- </dependencies>
-
-
+ </dependencies>
<build>
<finalName>regressionArea-web</finalName>
<plugins>
@@ -110,124 +75,6 @@
</webResources>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
-
+ </plugins>
</build>
-
- <profiles>
- <profile>
- <id>Test</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
-
- <build>
- <plugins>
- <!-- plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copyDataSource</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy file="../regressionArea-ear/resources/seam-ds.xml" toDir="${jbosshome}/server/${jbosscontext}/deploy"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>0.3.1</version>
- <executions>
- <execution>
- <id>start-container</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy</goal>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop-container</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <wait>false</wait>
- <container>
- <containerId>jboss4x</containerId>
- <home>${jbosshome}</home>
- <append>false</append>
- </container>
- <configuration>
- <home>${jbosshome}/server/${jbosscontext}</home>
- <type>existing</type>
- <properties>
- <cargo.hostname>localhost</cargo.hostname>
- <cargo.jboss.configuration>${jbosscontext}</cargo.jboss.configuration>
- <cargo.rmi.port>1099</cargo.rmi.port>
- </properties>
- </configuration>
- <deployer>
- <type>installed</type>
- <deployables>
- <deployable>
- <location>${settings.localRepository}/org/richfaces/test-applications/regressionArea/regressionArea-ear/${version}/regressionArea-ear-${version}.ear</location>
- <type>ear</type>
- </deployable>
- </deployables>
- </deployer>
- </configuration>
- </plugin -->
- <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 -->
- <suiteXmlFiles>
- <suiteXmlFile>
- src/test/resources/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>
- </profiles>
</project>
More information about the richfaces-svn-commits
mailing list