continuum-commits mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=924630&view=rev
Log:
make sure the SVN URL is a proper SVN URL, even on Windows

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=924630&r1=924629&r2=924630&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/pom.xml (original)
+++ continuum/trunk/continuum-webapp-test/pom.xml Thu Mar 18 04:17:03 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}/target/example-svn</svn.base.url>
+                  <svn.base.url>${svn.base.url}</svn.base.url>
                 </systemProperties>
                 <dependencies>
                   <dependency>
@@ -306,6 +306,7 @@ under the License.
           </plugin>
           <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.3</version>
             <executions>
               <execution>
                 <phase>generate-resources</phase>
@@ -321,11 +322,39 @@ under the License.
                     <copy todir="${project.build.directory}/example-svn">
                       <fileset dir="src/test/example-svn" />
                     </copy>
+                    <!-- This doesn't work, SVN doesn't like the file:/ URL it gives
+                    <makeurl file="${project.build.directory}/example-svn" property="svn.base.url"/>
+                    -->
+                    <path id="svn.repo.dir">
+                      <pathelement location="${project.build.directory}/example-svn" />
+                    </path>
+                    <pathconvert refid="svn.repo.dir" targetos="unix" property="svn.base.url"/>
+                    <echo file="${project.build.directory}/filter.properties">
+                      svn.base.url=file://localhost/${svn.base.url}
+                    </echo>
                   </tasks>
                 </configuration>
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>properties-maven-plugin</artifactId>
+            <version>1.0-alpha-2</version>
+            <executions>
+              <execution>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>read-project-properties</goal>
+                </goals>
+                <configuration>
+                  <files>
+                    <file>${project.build.directory}/filter.properties</file>
+                  </files>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>

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=924630&r1=924629&r2=924630&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
04:17:03 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}/target/example-svn/trunk/continuum-build-queue-test-data
+M2_PROJ_GRP_SCM_ROOT_URL=scm:svn:${svn.base.url}/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}/target/example-svn/trunk/simple-example
-M2_DELETE_PROJ_TAGBASE=scm:svn:file://localhost/${basedir}/target/example-svn/tags
+M2_DELETE_PROJ_GRP_SCM_ROOT_URL=scm:svn:${svn.base.url}/trunk/simple-example
+M2_DELETE_PROJ_TAGBASE=scm:svn:${svn.base.url}/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}/target/example-svn/trunk/flat-example/flat-parent
+M2_SAME_LETTER_PROJ_GRP_SCM_ROOT_URL=scm:svn:${svn.base.url}/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