continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r924593 - in /continuum/trunk/continuum-webapp-test: pom.xml src/test/resources/testng.properties
Date Thu, 18 Mar 2010 01:38:24 GMT
Author: brett
Date: Thu Mar 18 01:38:24 2010
New Revision: 924593

URL: http://svn.apache.org/viewvc?rev=924593&view=rev
Log:
SVN gets modified in the tests so work from a copy

Modified:
    continuum/trunk/continuum-webapp-test/pom.xml
    continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties

Modified: continuum/trunk/continuum-webapp-test/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/pom.xml?rev=924593&r1=924592&r2=924593&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/pom.xml (original)
+++ continuum/trunk/continuum-webapp-test/pom.xml Thu Mar 18 01:38:24 2010
@@ -233,7 +233,7 @@ under the License.
                 <systemProperties>
                   <appserver.base>${project.build.directory}</appserver.base>
                   <derby.system.home>${project.build.directory}</derby.system.home>
-                  <svn.base.url>file://localhost/${basedir}/src/test/example-svn</svn.base.url>
+                  <svn.base.url>file://localhost/${project.build.directory}/example-svn</svn.base.url>
                 </systemProperties>
                 <dependencies>
                   <dependency>
@@ -317,6 +317,10 @@ under the License.
                     <copy todir="${project.build.directory}">
                       <fileset dir="src/appserver-base" />
                     </copy>
+                    <delete dir="${project.build.directory}/example-svn" />
+                    <copy todir="${project.build.directory}/example-svn">
+                      <fileset dir="src/test/example-svn" />
+                    </copy>
                   </tasks>
                 </configuration>
               </execution>

Modified: continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties?rev=924593&r1=924592&r2=924593&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties (original)
+++ continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties Thu Mar 18
01:38:24 2010
@@ -24,7 +24,7 @@ M2_POM_URL=http://localhost:9595/example
 M2_PROJ_GRP_NAME=ContinuumBuildQueueTestData
 M2_PROJ_GRP_ID=org.apache.continuum
 M2_PROJ_GRP_DESCRIPTION=Project for testing continuum build queue
-M2_PROJ_GRP_SCM_ROOT_URL=scm:svn:file://localhost/${basedir}/src/test/example-svn/trunk/continuum-build-queue-test-data
+M2_PROJ_GRP_SCM_ROOT_URL=scm:svn:file://localhost/${basedir}/target/example-svn/trunk/continuum-build-queue-test-data
 M2_POM_USERNAME=
 M2_POM_PASSWORD=
 
@@ -33,8 +33,8 @@ M2_DELETE_POM_URL=http://localhost:9595/
 M2_DELETE_PROJ_GRP_NAME=Continuum Simple Example Project
 M2_DELETE_PROJ_GRP_ID=org.apache.continuum.examples.simple
 M2_DELETE_PROJ_GRP_DESCRIPTION=Delete test project
-M2_DELETE_PROJ_GRP_SCM_ROOT_URL=scm:svn:file://localhost/${basedir}/src/test/example-svn/trunk/simple-example
-M2_DELETE_PROJ_TAGBASE=scm:svn:file://localhost/${basedir}/src/test/example-svn/tags
+M2_DELETE_PROJ_GRP_SCM_ROOT_URL=scm:svn:file://localhost/${basedir}/target/example-svn/trunk/simple-example
+M2_DELETE_PROJ_TAGBASE=scm:svn:file://localhost/${basedir}/target/example-svn/tags
 M2_DELETE_PROJ_TAG=simple-example-1.0
 M2_DELETE_PROJ_RELEASE_VERSION=1.0
 M2_DELETE_PROJ_DEVELOPMENT_VERSION=1.1-SNAPSHOT
@@ -51,7 +51,7 @@ M2_SAME_LETTER_POM_URL=http://localhost:
 M2_SAME_LETTER_PROJ_GRP_NAME=Flat Example
 M2_SAME_LETTER_PROJ_GRP_ID=com.example.flat
 M2_SAME_LETTER_PROJ_GRP_DESCRIPTION=
-M2_SAME_LETTER_PROJ_GRP_SCM_ROOT_URL=scm:svn:file://localhost/${basedir}/src/test/example-svn/trunk/flat-example/flat-parent
+M2_SAME_LETTER_PROJ_GRP_SCM_ROOT_URL=scm:svn:file://localhost/${basedir}/target/example-svn/trunk/flat-example/flat-parent
 
 # Properties for testBuildMaven2ProjectWithTag
 M2_PROJ_WITH_TAG_POM_URL=http://localhost:9595/example-projects/continuum-2437-example/pom.xml



Mime
View raw message