summaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web
diff options
context:
space:
mode:
authorBrett Porter <brett@apache.org>2009-11-10 10:26:23 +0000
committerBrett Porter <brett@apache.org>2009-11-10 10:26:23 +0000
commit08bdeff48b4044b6fc190742e6ac92f81677f84f (patch)
treece856ff28434271d1ec5c3d21736aabe1133dcd7 /archiva-modules/archiva-web
parent8ff4b8cf349c8a2f0eb509b7600ff94fba6669ff (diff)
downloadarchiva-08bdeff48b4044b6fc190742e6ac92f81677f84f.tar.gz
archiva-08bdeff48b4044b6fc190742e6ac92f81677f84f.zip
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
Diffstat (limited to 'archiva-modules/archiva-web')
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt6
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-test/pom.xml23
2 files changed, 26 insertions, 3 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt b/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
index 5a24e5b8d..a1d2d6396 100644
--- 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 fefc2bb6c..c48b833dc 100644
--- 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>
@@ -443,6 +443,24 @@
</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>
<plugins>
@@ -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>