Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix location of cargo install 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1177971 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2011-10-01 12:19:20 +00:00
parent 21f46a8038
commit 68267a0c88
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archiva-modules/archiva-web/archiva-webapp-test/pom.xml
View File

@ -35,8 +35,8 @@
<tomcat6x.version>6.0.33</tomcat6x.version> <tomcat6x.version>6.0.33</tomcat6x.version>
<cargo.wait>false</cargo.wait> <cargo.wait>false</cargo.wait>
<cargo.timeout>600000</cargo.timeout> <cargo.timeout>600000</cargo.timeout>
<cargo.install.dir>${project.build.directory}/cargo-installs</cargo.install.dir> <cargo.install.dir>${project.build.directory}/cargo/installs</cargo.install.dir>
<maxWaitTimeInMs>60000</maxWaitTimeInMs> <maxWaitTimeInMs>30000</maxWaitTimeInMs>
<!-- TODO: review how appropriate the memory settings are - should work with less --> <!-- TODO: review how appropriate the memory settings are - should work with less -->
<cargo.jvm.args>-Xmx512m -XX:MaxPermSize=256m</cargo.jvm.args> <cargo.jvm.args>-Xmx512m -XX:MaxPermSize=256m</cargo.jvm.args>
<seleniumPluginVersion>2.0</seleniumPluginVersion> <seleniumPluginVersion>2.0</seleniumPluginVersion>
@ -352,14 +352,14 @@
<fileset dir="src/test/${container.name}"/> <fileset dir="src/test/${container.name}"/>
</copy> </copy>
<copy <copy
todir="${cargo.install.dir}/${container.name}/apache-tomcat-${tomcat.version}/apache-tomcat-${tomcat.version}/common/lib"> todir="${cargo.install.dir}/apache-tomcat-${tomcat.version}/apache-tomcat-${tomcat.version}/common/lib">
<fileset dir="${project.build.directory}/providedDependencies"> <fileset dir="${project.build.directory}/providedDependencies">
<include name="**/*.jar"/> <include name="**/*.jar"/>
</fileset> </fileset>
</copy> </copy>
<!-- for tomcat 6 --> <!-- for tomcat 6 -->
<copy <copy
todir="${cargo.install.dir}/${container.name}/apache-tomcat-${tomcat.version}/apache-tomcat-${tomcat.version}/lib"> todir="${cargo.install.dir}/apache-tomcat-${tomcat.version}/apache-tomcat-${tomcat.version}/lib">
<fileset dir="${project.build.directory}/providedDependencies"> <fileset dir="${project.build.directory}/providedDependencies">
<include name="**/*.jar"/> <include name="**/*.jar"/>
</fileset> </fileset>