svn commit: r990360 - in /maven/surefire/trunk/surefire-integration-tests: pom.xml src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java

[be...@apache.org]

Author: bentmann
Date: Sat Aug 28 13:28:00 2010
New Revision: 990360

URL: http://svn.apache.org/viewvc?rev=990360&view=rev
Log:
o Fixed IT setup to use proper local repo

Modified:
    maven/surefire/trunk/surefire-integration-tests/pom.xml
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java

Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=990360&r1=990359&r2=990360&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/pom.xml Sat Aug 28 13:28:00 2010
@@ -115,6 +115,9 @@
       <plugin>
         <artifactId>maven-invoker-plugin</artifactId>
         <version>1.5</version>
+        <configuration>
+          <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
+        </configuration>
         <executions>
           <execution>
             <goals>
@@ -168,10 +171,10 @@
             </property>
             <property>
               <name>maven.settings.file</name>
-              <value>${project.build.directory}/private/settings.xml</value>
+              <value>${project.build.directory}/private/it-settings.xml</value>
             </property>
             <property>
-              <name>maven.staged.local.repo</name>
+              <name>maven.repo.local</name>
               <value>${project.build.directory}/it-repo</value>
             </property>
           </systemProperties>

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java?rev=990360&r1=990359&r2=990360&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java Sat Aug 28 13:28:00 2010
@@ -32,7 +32,7 @@ public abstract class AbstractSurefireIn
         goals.add( goal );
         if ( !verifier.getCliOptions().contains( "-s" ) )
         {
-            String settingsPath = System.getProperty( "maven.settings.file" ) + ".staged";
+            String settingsPath = System.getProperty( "maven.settings.file" );
             if ( settingsPath.indexOf( ' ' ) >= 0 )
             {
                 settingsPath = '"' + settingsPath + '"';

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java?rev=990360&r1=990359&r2=990360&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java Sat Aug 28 13:28:00 2010
@@ -38,7 +38,7 @@ public class SetUpForIntegrationTest
         // if the properties are missing we'll fail the test with an NPE and stop the build.
         File originalSettings = new File( System.getProperty( "maven.settings.file" ) );
         File newRepo = new File( System.getProperty( "maven.staged.local.repo" ) );
-        File newSettings = new File( originalSettings.getParentFile(), originalSettings.getName() + ".staged" );
+        File newSettings = new File( originalSettings.getParentFile(), "it-" + originalSettings.getName() );
         StagedLocalRepoHelper.createStagedSettingsXml( originalSettings, newRepo, newSettings );
     }
 }