geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r947916 - in /geronimo/server/branches/2.2/testsuite: console-testsuite/advanced/ console-testsuite/basic/ security-testsuite/test-security/ web-testsuite/test-2.1-jsps/ web-testsuite/test-2.5-servlets/ web-testsuite/test-jetty/ web-testsui...
Date Tue, 25 May 2010 05:09:59 GMT
Author: xiaming
Date: Tue May 25 05:09:59 2010
New Revision: 947916

URL: http://svn.apache.org/viewvc?rev=947916&view=rev
Log:
GERONIMO-5313 Add suitexmlfiles config to some test backets since selenium cases require the
config.

Modified:
    geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml
    geronimo/server/branches/2.2/testsuite/console-testsuite/basic/pom.xml
    geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/pom.xml
    geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.1-jsps/pom.xml
    geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.5-servlets/pom.xml
    geronimo/server/branches/2.2/testsuite/web-testsuite/test-jetty/pom.xml
    geronimo/server/branches/2.2/testsuite/web-testsuite/test-myfaces/pom.xml
    geronimo/server/branches/2.2/testsuite/web-testsuite/test-tomcat/pom.xml
    geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
    geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml

Modified: geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml?rev=947916&r1=947915&r2=947916&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/console-testsuite/advanced/pom.xml Tue May 25 05:09:59
2010
@@ -49,6 +49,12 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-failsafe-plugin</artifactId>
+                        <!--The case which uses selenium must have this configuration
to run, otherwise, selenium server won't launch -->
+                        <configuration>
+                            <suiteXmlFiles>
+							    <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+							</suiteXmlFiles>
+                        </configuration>   
 					</plugin>
 				</plugins>
 			</build>

Modified: geronimo/server/branches/2.2/testsuite/console-testsuite/basic/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/console-testsuite/basic/pom.xml?rev=947916&r1=947915&r2=947916&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/console-testsuite/basic/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/console-testsuite/basic/pom.xml Tue May 25 05:09:59
2010
@@ -49,6 +49,12 @@
                     <plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-failsafe-plugin</artifactId>
+                        <!--The case which uses selenium must have this configuration
to run, otherwise, selenium server won't launch -->
+                        <configuration>
+                            <suiteXmlFiles>
+							    <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+							</suiteXmlFiles>
+                        </configuration> 
 					</plugin>
                 </plugins>
             </build>

Modified: geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/pom.xml?rev=947916&r1=947915&r2=947916&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/pom.xml Tue May
25 05:09:59 2010
@@ -82,6 +82,10 @@
 			<build>
 				<plugins>
                     <plugin>
+				        <groupId>org.codehaus.mojo</groupId>
+				        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
+                    <plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-failsafe-plugin</artifactId>
 						<configuration>

Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.1-jsps/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.1-jsps/pom.xml?rev=947916&r1=947915&r2=947916&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.1-jsps/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.1-jsps/pom.xml Tue May 25
05:09:59 2010
@@ -56,6 +56,16 @@
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>selenium-maven-plugin</artifactId>
 					</plugin>
+                    <plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-failsafe-plugin</artifactId>
+                        <!--The case which uses selenium must have this configuration
to run, otherwise, selenium server won't launch -->
+                        <configuration>
+                            <suiteXmlFiles>
+							    <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+							</suiteXmlFiles>
+                        </configuration> 
+					</plugin>
 
 					<plugin>
 						<groupId>org.apache.geronimo.buildsupport</groupId>

Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.5-servlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.5-servlets/pom.xml?rev=947916&r1=947915&r2=947916&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.5-servlets/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-2.5-servlets/pom.xml Tue May
25 05:09:59 2010
@@ -50,6 +50,16 @@
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>selenium-maven-plugin</artifactId>
 					</plugin>
+                    <plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-failsafe-plugin</artifactId>
+                        <!--The case which uses selenium must have this configuration
to run, otherwise, selenium server won't launch -->
+                        <configuration>
+                            <suiteXmlFiles>
+							    <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+							</suiteXmlFiles>
+                        </configuration> 
+					</plugin>
 					<plugin>
 						<groupId>org.apache.geronimo.buildsupport</groupId>
 						<artifactId>geronimo-maven-plugin</artifactId>

Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-jetty/pom.xml?rev=947916&r1=947915&r2=947916&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-jetty/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-jetty/pom.xml Tue May 25 05:09:59
2010
@@ -50,6 +50,16 @@
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>selenium-maven-plugin</artifactId>
 					</plugin>
+                    <plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-failsafe-plugin</artifactId>
+                        <!--The case which uses selenium must have this configuration
to run, otherwise, selenium server won't launch -->
+                        <configuration>
+                            <suiteXmlFiles>
+							    <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+							</suiteXmlFiles>
+                        </configuration> 
+					</plugin>
 					<plugin>
 						<groupId>org.apache.geronimo.buildsupport</groupId>
 						<artifactId>geronimo-maven-plugin</artifactId>

Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-myfaces/pom.xml?rev=947916&r1=947915&r2=947916&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-myfaces/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-myfaces/pom.xml Tue May 25 05:09:59
2010
@@ -62,6 +62,16 @@
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>selenium-maven-plugin</artifactId>
 					</plugin>
+                    <plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-failsafe-plugin</artifactId>
+                        <!--The case which uses selenium must have this configuration
to run, otherwise, selenium server won't launch -->
+                        <configuration>
+                            <suiteXmlFiles>
+							    <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+							</suiteXmlFiles>
+                        </configuration> 
+					</plugin>
 					<plugin>
 						<groupId>org.apache.geronimo.buildsupport</groupId>
 						<artifactId>geronimo-maven-plugin</artifactId>

Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-tomcat/pom.xml?rev=947916&r1=947915&r2=947916&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-tomcat/pom.xml Tue May 25 05:09:59
2010
@@ -50,6 +50,16 @@
 				        <groupId>org.codehaus.mojo</groupId>
 					    <artifactId>selenium-maven-plugin</artifactId>
 				    </plugin>
+                    <plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-failsafe-plugin</artifactId>
+                        <!--The case which uses selenium must have this configuration
to run, otherwise, selenium server won't launch -->
+                        <configuration>
+                            <suiteXmlFiles>
+							    <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+							</suiteXmlFiles>
+                        </configuration> 
+					</plugin>
 					<plugin>
 						<groupId>org.apache.geronimo.buildsupport</groupId>
 						<artifactId>geronimo-maven-plugin</artifactId>

Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml?rev=947916&r1=947915&r2=947916&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
Tue May 25 05:09:59 2010
@@ -91,6 +91,12 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-failsafe-plugin</artifactId>
+                        <!--The case which uses selenium must have this configuration
to run, otherwise, selenium server won't launch -->
+                        <configuration>
+                            <suiteXmlFiles>
+							    <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+							</suiteXmlFiles>
+                        </configuration> 
 					</plugin>
 
 					<!-- "ear" packaging doesn't compile test classes -->

Modified: geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml?rev=947916&r1=947915&r2=947916&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
Tue May 25 05:09:59 2010
@@ -90,6 +90,12 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-failsafe-plugin</artifactId>
+                        <!--The case which uses selenium must have this configuration
to run, otherwise, selenium server won't launch -->
+                        <configuration>
+                            <suiteXmlFiles>
+							    <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+							</suiteXmlFiles>
+                        </configuration> 
 					</plugin>
 
 					<!-- "ear" packaging doesn't compile test classes -->



Mime
View raw message