geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r653493 - in /geronimo/server/trunk: testsuite/console-testsuite/advanced/pom.xml testsuite/console-testsuite/basic/pom.xml testsuite/pom.xml testsupport/testsupport-common/pom.xml testsupport/testsupport-selenium/pom.xml
Date Mon, 05 May 2008 14:30:59 GMT
Author: jdillon
Date: Mon May  5 07:30:58 2008
New Revision: 653493

URL: http://svn.apache.org/viewvc?rev=653493&view=rev
Log:
Some updates to use the latest selenium-m-p SNAPSHOT

Modified:
    geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml
    geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml
    geronimo/server/trunk/testsuite/pom.xml
    geronimo/server/trunk/testsupport/testsupport-common/pom.xml
    geronimo/server/trunk/testsupport/testsupport-selenium/pom.xml

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml?rev=653493&r1=653492&r2=653493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml Mon May  5 07:30:58
2008
@@ -23,13 +23,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>console-testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>advanced</artifactId>
     <name>Geronimo TestSuite :: Console Testsuite :: Advanced Tests</name>
     <packaging>jar</packaging>
@@ -37,7 +37,8 @@
     <description>
         Advanced test for the Geronimo console.
         maven-maven-plugin:invoke executes the 'child' profile.
-        Since build executions are done here, a 'child' profile is explicitly defined here
to prevent inheriting other configurations and executions from parent.
+        Since build executions are done here, a 'child' profile is explicitly
+        defined here to prevent inheriting other configurations and executions from parent.
     </description>
 
     <profiles>
@@ -45,11 +46,6 @@
             <id>child</id>
             <build>
                 <plugins>
-                   <plugin>
-                      <groupId>org.codehaus.mojo</groupId>
-                      <artifactId>selenium-maven-plugin</artifactId>
-                   </plugin>
-
                     <plugin>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>

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=653493&r1=653492&r2=653493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml Mon May  5 07:30:58 2008
@@ -23,13 +23,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>console-testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>basic</artifactId>
     <name>Geronimo TestSuite :: Console Testsuite :: Basic Tests</name>
     <packaging>jar</packaging>
@@ -37,7 +37,8 @@
     <description>
         Basic test for the Geronimo console.
         maven-maven-plugin:invoke executes the 'child' profile.
-        Since build executions are done here, a 'child' profile is explicitly defined here
to prevent inheriting other configurations and executions from parent.
+        Since build executions are done here, a 'child' profile is explicitly
+        defined here to prevent inheriting other configurations and executions from parent.
     </description>
 
     <profiles>
@@ -45,11 +46,6 @@
             <id>child</id>
             <build>
                 <plugins>
-                   <plugin>
-                      <groupId>org.codehaus.mojo</groupId>
-                      <artifactId>selenium-maven-plugin</artifactId>
-                   </plugin>
-
                     <plugin>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=653493&r1=653492&r2=653493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Mon May  5 07:30:58 2008
@@ -59,7 +59,13 @@
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>
             <artifactId>testsupport-selenium</artifactId>
-            <scope>provided</scope>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
@@ -98,9 +104,9 @@
                 </plugin>
                 
                 <!--
-                 FIXME: Need to reset the default values here since our parent sets up wars
-                        for use with jspc.  Remove once parent pom has been fixed.
-                 -->
+                FIXME: Need to reset the default values here since our parent sets up wars
+                       for use with jspc.  Remove once parent pom has been fixed.
+                -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
@@ -217,7 +223,7 @@
                     <artifactId>selenium-maven-plugin</artifactId>
                     <executions>
                         <execution>
-                            <id>start-server</id>
+                            <id>start</id>
                             <phase>pre-integration-test</phase>
                             <goals>
                                 <goal>start-server</goal>
@@ -227,6 +233,13 @@
                                 <background>true</background>
                             </configuration>
                         </execution>
+                        <execution>
+                            <id>stop</id>
+                            <phase>post-integration-test</phase>
+                            <goals>
+                                <goal>stop-server</goal>
+                            </goals>
+                        </execution>
                     </executions>
                 </plugin>
             </plugins>
@@ -263,7 +276,7 @@
                             <artifactId>geronimo-maven-plugin</artifactId>
                             <executions>
                                 <execution>
-                                    <id>start-server</id>
+                                    <id>start</id>
                                     <phase>pre-integration-test</phase>
                                     <goals>
                                         <goal>start-server</goal>
@@ -283,7 +296,7 @@
                                     </configuration>
                                 </execution>
                                 <execution>
-                                    <id>stop-server</id>
+                                    <id>stop</id>
                                     <phase>install</phase>
                                     <goals>
                                         <goal>stop-server</goal>
@@ -346,7 +359,7 @@
                             <artifactId>geronimo-maven-plugin</artifactId>
                             <executions>
                                 <execution>
-                                    <id>start-server</id>
+                                    <id>start</id>
                                     <phase>pre-integration-test</phase>
                                     <goals>
                                         <goal>start-server</goal>
@@ -368,4 +381,5 @@
             <id>child</id>
         </profile>
     </profiles>
+
 </project>

Modified: geronimo/server/trunk/testsupport/testsupport-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/testsupport-common/pom.xml?rev=653493&r1=653492&r2=653493&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/testsupport-common/pom.xml (original)
+++ geronimo/server/trunk/testsupport/testsupport-common/pom.xml Mon May  5 07:30:58 2008
@@ -31,7 +31,6 @@
     
     <artifactId>testsupport-common</artifactId>
     <name>Geronimo Test Support :: Common</name>
-    <packaging>jar</packaging>
     
     <dependencies>
         <dependency>

Modified: geronimo/server/trunk/testsupport/testsupport-selenium/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/testsupport-selenium/pom.xml?rev=653493&r1=653492&r2=653493&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/testsupport-selenium/pom.xml (original)
+++ geronimo/server/trunk/testsupport/testsupport-selenium/pom.xml Mon May  5 07:30:58 2008
@@ -29,7 +29,6 @@
     
     <artifactId>testsupport-selenium</artifactId>
     <name>Geronimo Test Support :: Selenium</name>
-    <packaging>jar</packaging>
     
     <dependencies>
         <dependency>
@@ -48,31 +47,44 @@
         <dependency>
             <groupId>org.openqa.selenium.client-drivers</groupId>
             <artifactId>selenium-java-client-driver</artifactId>
-            <version>0.8.1</version>
+            <version>1.0-beta-1</version>
         </dependency>
         
         <dependency>
             <groupId>org.openqa.selenium.server</groupId>
             <artifactId>selenium-server</artifactId>
-            <version>0.8.1</version>
+            <version>1.0-beta-1</version>
         </dependency>
         
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <classifier>jdk15</classifier>
             <version>5.1</version>
+            <classifier>jdk15</classifier>
         </dependency>
     </dependencies>
 
     <!--
-    NOTE: This is needed to pull Selenium artifacts.
+    NOTE: These are needed to pull Selenium artifacts.
     -->
+    
     <repositories>
         <repository>
-            <id>openqa</id>
-            <name>OpenQA Repository</name>
-            <url>http://maven.openqa.org</url>
+            <id>openqa.org</id>
+            <name>Openqa Release Repository</name>
+            <url>http://archiva.openqa.org/repository/releases</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+        <repository>
+            <id>openqa.org</id>
+            <name>Openqa Snapshot Repository</name>
+            <url>http://archiva.openqa.org/repository/snapshots</url>
             <layout>default</layout>
             <snapshots>
                 <enabled>true</enabled>
@@ -80,7 +92,7 @@
                 <checksumPolicy>ignore</checksumPolicy>
             </snapshots>
             <releases>
-                <enabled>true</enabled>
+                <enabled>false</enabled>
             </releases>
         </repository>
     </repositories>



Mime
View raw message