geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r440105 - in /geronimo/server/trunk/testsuite/console-testsuite: basic-junit/pom.xml basic/pom.xml pom.xml
Date Mon, 04 Sep 2006 15:17:52 GMT
Author: jdillon
Date: Mon Sep  4 08:17:52 2006
New Revision: 440105

URL: http://svn.apache.org/viewvc?view=rev&rev=440105
Log:
Using maven-maven-plugin proto, with this we specify a default profile with the test setup
and then an empty child profile which the child builds are invoked with
Now child poms can inherit from their direct parent, and we can put common config there
Pending a better way to invoke a set of modules.. right now you have to configure invoke each
Also, no log to file, logs are inline with the calling mvn process (as nested [INFO] [INFO]
blah blah)

Modified:
    geronimo/server/trunk/testsuite/console-testsuite/basic-junit/pom.xml
    geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml
    geronimo/server/trunk/testsuite/console-testsuite/pom.xml

Modified: geronimo/server/trunk/testsuite/console-testsuite/basic-junit/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic-junit/pom.xml?view=diff&rev=440105&r1=440104&r2=440105
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic-junit/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic-junit/pom.xml Mon Sep  4 08:17:52
2006
@@ -24,15 +24,11 @@
     
     <modelVersion>4.0.0</modelVersion>
     
-    <!--
-    NOTE: Picking up configuration from top-level testsuite module, to avoid
-          inheriting the setup from our direct parent.
-    -->
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>testsuite</artifactId>
+        <artifactId>console-testsuite</artifactId>
         <version>1.2-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>basic-junit</artifactId>
@@ -42,19 +38,5 @@
     <description>
         Basic test for the Geronimo console.
     </description>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.openqa.selenium.client-drivers</groupId>
-            <artifactId>selenium-java-client-driver</artifactId>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.openqa.selenium.server</groupId>
-            <artifactId>selenium-server</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-   
+
 </project>

Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml?view=diff&rev=440105&r1=440104&r2=440105
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml Mon Sep  4 08:17:52 2006
@@ -24,15 +24,11 @@
     
     <modelVersion>4.0.0</modelVersion>
     
-    <!--
-    NOTE: Picking up configuration from top-level testsuite module, to avoid
-          inheriting the setup from our direct parent.
-    -->
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>testsuite</artifactId>
+        <artifactId>console-testsuite</artifactId>
         <version>1.2-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>basic</artifactId>
@@ -48,18 +44,6 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <classifier>jdk14</classifier>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.openqa.selenium.client-drivers</groupId>
-            <artifactId>selenium-java-client-driver</artifactId>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.openqa.selenium.server</groupId>
-            <artifactId>selenium-server</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/testsuite/console-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/pom.xml?view=diff&rev=440105&r1=440104&r2=440105
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/pom.xml Mon Sep  4 08:17:52 2006
@@ -39,75 +39,143 @@
         Geronimo console testsuite.
     </description>
     
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>selenium-maven-plugin</artifactId>
-                
-                <executions>
-                    <execution>
-                        <id>start-server</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start</goal>
-                        </goals>
-                        <configuration>
-                            <background>true</background>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+    <dependencies>
+        <dependency>
+            <groupId>org.openqa.selenium.client-drivers</groupId>
+            <artifactId>selenium-java-client-driver</artifactId>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.openqa.selenium.server</groupId>
+            <artifactId>selenium-server</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <profiles>
+        <profile>
+            <id>default</id>
             
-            <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                
-                <executions>
-                    <execution>
-                        <id>start-server</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start</goal>
-                        </goals>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                        
+                        <executions>
+                            <execution>
+                                <id>start-server</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                </goals>
+                                <configuration>
+                                    <background>true</background>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    
+                    <plugin>
+                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        
+                        <executions>
+                            <execution>
+                                <id>start-server</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                </goals>
+                                <configuration>
+                                    <background>true</background>
+                                </configuration>
+                            </execution>
+                            
+                            <execution>
+                                <id>stop-server</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    
+                    <plugin>
+                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                        <artifactId>maven-maven-plugin</artifactId>
+                        
+                        <executions>
+                            <execution>
+                                <id>basic</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>invoke</goal>
+                                </goals>
+                                
+                                <configuration>
+                                    <pomFile>${pom.basedir}/basic/pom.xml</pomFile>
+                                    <flags>
+                                        <flag>-Pchild</flag>
+                                    </flags>
+                                </configuration>
+                            </execution>
+                            
+                            <execution>
+                                <id>basic-junit</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>invoke</goal>
+                                </goals>
+                                
+                                <configuration>
+                                    <pomFile>${pom.basedir}/basic-junit/pom.xml</pomFile>
+                                    <flags>
+                                        <flag>-Pchild</flag>
+                                    </flags>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    
+                    <!--
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-invoker-plugin</artifactId>
+                        
                         <configuration>
-                            <background>true</background>
+                            <debug>true</debug>
+                            <projectsDirectory>${pom.basedir}</projectsDirectory>
+                            <pomIncludes>
+                                <pomInclude>*/pom.xml</pomInclude>
+                            </pomIncludes>
                         </configuration>
-                    </execution>
-                    
-                    <execution>
-                        <id>stop-server</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>stop</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-invoker-plugin</artifactId>
-                
-                <configuration>
-                    <debug>true</debug>
-                    <projectsDirectory>${pom.basedir}</projectsDirectory>
-                    <pomIncludes>
-                        <pomInclude>*/pom.xml</pomInclude>
-                    </pomIncludes>
-                </configuration>
-                
-                <executions>
-                    <execution>
-                        <id>integration-test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+                        
+                        <executions>
+                            <execution>
+                                <id>integration-test</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    -->
+                </plugins>
+            </build>
+        </profile>
+        
+        <profile>
+            <id>child</id>
+        </profile>
+        
+    </profiles>
 
 </project>



Mime
View raw message