Author: brett
Date: Tue Nov 10 10:26:23 2009
New Revision: 834415
URL: http://svn.apache.org/viewvc?rev=834415&view=rev
Log:
store cargo installations outside target to avoid re-downloading
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/ (props
changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Nov 10 10:26:23 2009
@@ -6,3 +6,4 @@
.settings
.classpath
.project
+cargo-installs
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt?rev=834415&r1=834414&r2=834415&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
Tue Nov 10 10:26:23 2009
@@ -9,7 +9,11 @@
- 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
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=834415&r1=834414&r2=834415&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 Tue
Nov 10 10:26:23 2009
@@ -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>
