archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wsm...@apache.org
Subject svn commit: r761154 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test: pom.xml src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java src/test/it/org/apache/maven/archiva/web/test/AbstractSeleniumTestCase.java
Date Thu, 02 Apr 2009 03:31:20 GMT
Author: wsmoak
Date: Thu Apr  2 03:31:19 2009
New Revision: 761154

URL: http://svn.apache.org/viewvc?rev=761154&view=rev
Log:
[MRM-1164] Copy in AbstractSeleniumTestCase to remove the dependency on old shared UI tests
from Maven, and update version numbers.

Added:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractSeleniumTestCase.java
      - copied, changed from r761150, continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AbstractSeleniumTestCase.java
Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml?rev=761154&r1=761153&r2=761154&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml Thu Apr  2 03:31:19
2009
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-webapp-test</artifactId>
   <packaging>pom</packaging>
@@ -46,12 +46,6 @@
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-web-ui-tests</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
@@ -59,7 +53,13 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-slf4j-logging</artifactId>
     </dependency>
-    
+    <dependency>
+      <groupId>org.openqa.selenium.client-drivers</groupId>
+      <artifactId>selenium-java-client-driver</artifactId>
+      <version>0.8.1</version>
+      <scope>test</scope>
+    </dependency>
+
     <!-- Dependency for MavenConnectionTest -->
     <dependency>
       <groupId>jdom</groupId>
@@ -222,6 +222,7 @@
       <plugin>
         <groupId>org.codehaus.cargo</groupId>
         <artifactId>cargo-maven2-plugin</artifactId>
+        <version>1.0</version>
         <executions>
           <execution>
             <id>start-container</id>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java?rev=761154&r1=761153&r2=761154&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java
Thu Apr  2 03:31:19 2009
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import org.apache.maven.shared.web.test.AbstractSeleniumTestCase;
 
 /**
  */

Copied: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractSeleniumTestCase.java
(from r761150, continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AbstractSeleniumTestCase.java)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractSeleniumTestCase.java?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractSeleniumTestCase.java&p1=continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AbstractSeleniumTestCase.java&r1=761150&r2=761154&rev=761154&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AbstractSeleniumTestCase.java
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractSeleniumTestCase.java
Thu Apr  2 03:31:19 2009
@@ -1,4 +1,4 @@
-package org.apache.continuum.web.test;
+package org.apache.maven.archiva.web.test;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one



Mime
View raw message