geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r439759 - in /geronimo/server/trunk/testsuite: console-testsuite/basic/pom.xml console-testsuite/pom.xml pom.xml
Date Sun, 03 Sep 2006 10:56:06 GMT
Author: jdillon
Date: Sun Sep  3 03:56:06 2006
New Revision: 439759

URL: http://svn.apache.org/viewvc?rev=439759&view=rev
Log:
Update testsuite configuration to use latest plugin changes
Also, change basic/pom.xml to inherit from testsuite to avoid duplicate server plugin configuration
from getting picked up

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

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?rev=439759&r1=439758&r2=439759&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml Sun Sep  3 03:56:06 2006
@@ -24,11 +24,15 @@
     
     <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>console-testsuite</artifactId>
+        <artifactId>testsuite</artifactId>
         <version>1.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     
     <artifactId>basic</artifactId>
@@ -38,5 +42,19 @@
     <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/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/pom.xml?rev=439759&r1=439758&r2=439759&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/pom.xml Sun Sep  3 03:56:06 2006
@@ -39,53 +39,9 @@
         Geronimo console testsuite.
     </description>
     
-    <dependencies>
-
-        <dependency>
-            <groupId>org.openqa.selenium.client-drivers</groupId>
-            <artifactId>selenium-java-client-driver</artifactId>
-            <version>0.8.1</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.openqa.selenium.server</groupId>
-            <artifactId>selenium-server</artifactId>
-            <version>0.8.1</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>dependency-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-assemblies</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.assemblies</groupId>
-                                    <artifactId>geronimo-jetty-j2ee</artifactId>
-                                    <version>${pom.version}</version>
-                                    <classifier>bin</classifier>
-                                    <type>zip</type>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/assemblies</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            
-            <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>selenium-maven-plugin</artifactId>
                 
@@ -96,35 +52,16 @@
                         <goals>
                             <goal>start</goal>
                         </goals>
+                        <configuration>
+                            <background>true</background>
+                        </configuration>
                     </execution>
-                    
-                    <!--
-                    FIXME: No stop... hope the process dies when mvn does
-                    
-                    <execution>
-                        <id>stop-server</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>stop</goal>
-                        </goals>
-                    </execution>
-                    -->
                 </executions>
             </plugin>
             
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>server-maven-plugin</artifactId>
-                
-                <configuration>
-                    <assembly>
-                        <groupId>org.apache.geronimo.assemblies</groupId>
-                        <artifactId>geronimo-jetty-j2ee</artifactId>
-                        <version>${pom.version}</version>
-                        <classifier>bin</classifier>
-                        <type>zip</type>
-                    </assembly>
-                </configuration>
+                <artifactId>geronimo-maven-plugin</artifactId>
                 
                 <executions>
                     <execution>
@@ -133,6 +70,9 @@
                         <goals>
                             <goal>start</goal>
                         </goals>
+                        <configuration>
+                            <background>true</background>
+                        </configuration>
                     </execution>
                     
                     <execution>
@@ -168,48 +108,6 @@
                     </execution>
                 </executions>
             </plugin>
-            
-            <!--
-            NOTE: Cargo will not currently work woth G 1.2, needs some patches,
-                  in the mean time use the server plugin.
-            -->
-            <plugin>
-                <groupId>org.codehaus.cargo</groupId>
-                <artifactId>cargo-maven2-plugin</artifactId>
-                
-                <configuration>
-                    <container>
-                        <containerId>geronimo1x</containerId>
-                        <home>${project.build.directory}/assemblies/geronimo-jetty-j2ee-${pom.version}</home>
-                        <type>installed</type>
-                    </container>
-                    <configuration>
-                        <type>existing</type>
-                        <home>${project.build.directory}/assemblies/geronimo-jetty-j2ee-${pom.version}</home>
-                    </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>
 

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=439759&r1=439758&r2=439759&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Sun Sep  3 03:56:06 2006
@@ -44,17 +44,21 @@
         <module>console-testsuite</module>
     </modules>
     
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.cargo</groupId>
-                    <artifactId>cargo-maven2-plugin</artifactId>
-                    <version>0.3-SNAPSHOT</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.openqa.selenium.client-drivers</groupId>
+                <artifactId>selenium-java-client-driver</artifactId>
+                <version>0.8.1</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.openqa.selenium.server</groupId>
+                <artifactId>selenium-server</artifactId>
+                <version>0.8.1</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     
     <repositories>
         <repository>



Mime
View raw message