store cargo installations outside target to avoid re-downloading

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@834415 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt b/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
index 5a24e5b8d6af7b5df83c40c4e470cf51236ca14f..a1d2d63963c2b95244651ad10e61203e1c9eef19 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
+++ b/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
@@ -9,7 +9,11 @@ Run Selenium tests in src/test/testng against an existing Archiva instance
   - modify src/test/resources/testng.properties as needed
   - mvn clean install -Dcontainer-existing
 
+The Cargo installations are stored outside of target to avoid multiple downloads.
+To remove the Cargo installations and re-download them next run, use:
+  - mvn -Pclean-cargo clean
+
 For the default values in the scripts, to pass all the tests, you need to add an artifact in internal repository.
 
 Run Selenium tests in src/test/it with Maven and JUnit
-  - mvn clean install -f junit-pom.xml
\ No newline at end of file
+  - mvn clean install -f junit-pom.xml

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index fefc2bb6c637d3334cd4b9c109a83e21c31344bf..c48b833dc09fca79289154dcf5e0cd0f3504af92 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -265,7 +265,7 @@
                       <fileset dir="src/test/${container.name}" />
                     </copy>
                     <copy
-                      todir="${project.build.directory}/installs/${container.name}/apache-tomcat-${tomcat5x.version}/apache-tomcat-${tomcat5x.version}/common/lib">
+                      todir="${cargo.install.dir}/${container.name}/apache-tomcat-${tomcat5x.version}/apache-tomcat-${tomcat5x.version}/common/lib">
                       <fileset dir="${project.build.directory}/providedDependencies">
                         <include name="**/*.jar" />
                       </fileset>
@@ -317,7 +317,7 @@
                 <containerId>${container.name}</containerId>
                 <zipUrlInstaller>
                   <url>${container.url}</url>
-                  <installDir>${project.build.directory}/installs/${container.name}</installDir>
+                  <installDir>${cargo.install.dir}/${container.name}</installDir>
                 </zipUrlInstaller>
                 <log>${project.build.directory}/logs/${container.name}.log</log>
                 <output>${project.build.directory}/logs/${container.name}.out</output>
@@ -442,6 +442,24 @@
         <selenium.browser>*custom ${browserPath}</selenium.browser>
       </properties>
     </profile>
+    <profile>
+      <id>clean-cargo</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-clean-plugin</artifactId>
+            <configuration>
+              <filesets>
+                <fileset>
+                  <directory>${cargo.install.dir}</directory>
+                </fileset>
+              </filesets>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>headless</id>
       <build>
@@ -466,5 +484,6 @@
   <properties>
     <tomcat5x.version>5.5.27</tomcat5x.version>
     <cargo.wait>false</cargo.wait>
+    <cargo.install.dir>cargo-installs</cargo.install.dir>
   </properties>
 </project>