svn commit: r1177971 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml

[br...@apache.org]

Author: brett
Date: Sat Oct  1 12:19:20 2011
New Revision: 1177971

URL: http://svn.apache.org/viewvc?rev=1177971&view=rev
Log:
fix location of cargo install

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/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=1177971&r1=1177970&r2=1177971&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 Sat Oct  1 12:19:20 2011
@@ -35,8 +35,8 @@
     <tomcat6x.version>6.0.33</tomcat6x.version>
     <cargo.wait>false</cargo.wait>
     <cargo.timeout>600000</cargo.timeout>
-    <cargo.install.dir>${project.build.directory}/cargo-installs</cargo.install.dir>
-    <maxWaitTimeInMs>60000</maxWaitTimeInMs>
+    <cargo.install.dir>${project.build.directory}/cargo/installs</cargo.install.dir>
+    <maxWaitTimeInMs>30000</maxWaitTimeInMs>
     <!-- TODO: review how appropriate the memory settings are - should work with less -->
     <cargo.jvm.args>-Xmx512m -XX:MaxPermSize=256m</cargo.jvm.args>
     <seleniumPluginVersion>2.0</seleniumPluginVersion>
@@ -352,14 +352,14 @@
                       <fileset dir="src/test/${container.name}"/>
                     </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">
                         <include name="**/*.jar"/>
                       </fileset>
                     </copy>
                     <!-- for tomcat 6 -->
                     <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">
                         <include name="**/*.jar"/>
                       </fileset>