You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/05/09 09:36:48 UTC
svn commit: r654708 - in /geronimo/server/trunk/testsuite: ./
console-testsuite/ corba-testsuite/ deployment-testsuite/
enterprise-testsuite/ security-testsuite/ web-testsuite/
webservices-testsuite/
Author: jdillon
Date: Fri May 9 00:36:47 2008
New Revision: 654708
URL: http://svn.apache.org/viewvc?rev=654708&view=rev
Log:
Run integration tests via shitty from the top-level to re-use the installed assembly + selenium muck and provide more build detail w/out digging through log files
Removed:
geronimo/server/trunk/testsuite/console-testsuite/goals.txt
geronimo/server/trunk/testsuite/corba-testsuite/goals.txt
geronimo/server/trunk/testsuite/deployment-testsuite/goals.txt
geronimo/server/trunk/testsuite/enterprise-testsuite/goals.txt
geronimo/server/trunk/testsuite/security-testsuite/goals.txt
geronimo/server/trunk/testsuite/web-testsuite/goals.txt
geronimo/server/trunk/testsuite/webservices-testsuite/goals.txt
Modified:
geronimo/server/trunk/testsuite/console-testsuite/pom.xml
geronimo/server/trunk/testsuite/corba-testsuite/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
geronimo/server/trunk/testsuite/pom.xml
geronimo/server/trunk/testsuite/security-testsuite/pom.xml
geronimo/server/trunk/testsuite/web-testsuite/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml
Modified: geronimo/server/trunk/testsuite/console-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/pom.xml?rev=654708&r1=654707&r2=654708&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/pom.xml Fri May 9 00:36:47 2008
@@ -61,12 +61,6 @@
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>shitty-maven-plugin</artifactId>
- <inherited>false</inherited>
- </plugin>
-
- <plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>testsuite-maven-plugin</artifactId>
<inherited>false</inherited>
Modified: geronimo/server/trunk/testsuite/corba-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/pom.xml?rev=654708&r1=654707&r2=654708&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/pom.xml Fri May 9 00:36:47 2008
@@ -61,12 +61,6 @@
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>shitty-maven-plugin</artifactId>
- <inherited>false</inherited>
- </plugin>
-
- <plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>testsuite-maven-plugin</artifactId>
<inherited>false</inherited>
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml?rev=654708&r1=654707&r2=654708&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml Fri May 9 00:36:47 2008
@@ -61,12 +61,6 @@
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>shitty-maven-plugin</artifactId>
- <inherited>false</inherited>
- </plugin>
-
- <plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>testsuite-maven-plugin</artifactId>
<inherited>false</inherited>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml?rev=654708&r1=654707&r2=654708&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml Fri May 9 00:36:47 2008
@@ -69,12 +69,6 @@
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>shitty-maven-plugin</artifactId>
- <inherited>false</inherited>
- </plugin>
-
- <plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>testsuite-maven-plugin</artifactId>
<inherited>false</inherited>
Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=654708&r1=654707&r2=654708&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Fri May 9 00:36:47 2008
@@ -75,30 +75,6 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>shitty-maven-plugin</artifactId>
- <configuration>
- <projects>
- <fileset>
- <directory>${project.basedir}</directory>
- <includes>
- <include>*/pom.xml</include>
- </includes>
- </fileset>
- </projects>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>clean</goal>
- <goal>install</goal>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<configuration>
@@ -214,6 +190,7 @@
<logOutput>true</logOutput>
<background>true</background>
<verifyTimeout>300</verifyTimeout>
+ <refresh>true</refresh>
<optionSets>
<optionSet>
<id>default</id>
@@ -238,6 +215,25 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>shitty-maven-plugin</artifactId>
<inherited>false</inherited>
+ <configuration>
+ <projects>
+ <fileset>
+ <directory>${project.basedir}</directory>
+ <includes>
+ <include>*/*/pom.xml</include>
+ </includes>
+ </fileset>
+ </projects>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>clean</goal>
+ <goal>install</goal>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
Modified: geronimo/server/trunk/testsuite/security-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/pom.xml?rev=654708&r1=654707&r2=654708&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/security-testsuite/pom.xml Fri May 9 00:36:47 2008
@@ -61,12 +61,6 @@
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>shitty-maven-plugin</artifactId>
- <inherited>false</inherited>
- </plugin>
-
- <plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>testsuite-maven-plugin</artifactId>
<inherited>false</inherited>
Modified: geronimo/server/trunk/testsuite/web-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/pom.xml?rev=654708&r1=654707&r2=654708&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/pom.xml Fri May 9 00:36:47 2008
@@ -70,6 +70,7 @@
</pluginManagement>
<plugins>
+ <!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>shitty-maven-plugin</artifactId>
@@ -81,10 +82,9 @@
<includes>
<include>*/pom.xml</include>
</includes>
-
- <!--
+ <!- -
HACK: Skip tomcat (or jetty) tests for now till we figure out how to switch it dynamically
- -->
+ - ->
<excludes>
<exclude>${excludeTest}/pom.xml</exclude>
</excludes>
@@ -101,6 +101,7 @@
</execution>
</executions>
</plugin>
+ -->
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml?rev=654708&r1=654707&r2=654708&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml Fri May 9 00:36:47 2008
@@ -58,12 +58,6 @@
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>shitty-maven-plugin</artifactId>
- <inherited>false</inherited>
- </plugin>
-
- <plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>testsuite-maven-plugin</artifactId>
<inherited>false</inherited>