svn commit: r394244 - /maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java

[jv...@apache.org]

Author: jvanzyl
Date: Fri Apr 14 19:14:46 2006
New Revision: 394244

URL: http://svn.apache.org/viewcvs?rev=394244&view=rev
Log:
o look for the maven.repo.local system property first like maven does itself
o a hack to prevent velocity resource loading errors from triggering failures. when generating archetypes in tests
  the velocity resources loader always freaks out and cries error when it's not fatal.


Modified:
    maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java

Modified: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java?rev=394244&r1=394243&r2=394244&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java (original)
+++ maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java Fri Apr 14 19:14:46 2006
@@ -125,7 +125,8 @@
             {
                 String line = (String) i.next();
 
-                if ( line.indexOf( "[ERROR]" ) >= 0 )
+                // A hack to keep stupid velocity resource loader errors from triggering failure
+                if ( line.indexOf( "[ERROR]" ) >= 0 && line.indexOf( "VM_global_library.vm" ) == -1 )
                 {
                     throw new VerificationException( "Error in execution." );
                 }
@@ -649,8 +650,8 @@
                 cli.createArgument().setLine( "-D" + key + "=" + properties.getProperty( key ) );
             }
 
-            boolean useMavenRepoLocal =
-                Boolean.valueOf( controlProperties.getProperty( "use.mavenRepoLocal", "true" ) ).booleanValue();
+            boolean useMavenRepoLocal = Boolean.valueOf( controlProperties.getProperty( "use.mavenRepoLocal", "true" ) ).booleanValue();
+
             if ( useMavenRepoLocal )
             {
                 // Note: Make sure that the repo is surrounded by quotes as it can possibly have
@@ -778,12 +779,17 @@
 
         if ( localRepo == null )
         {
+            localRepo = System.getProperty( "maven.repo.local" );
+        }
+
+        if ( localRepo == null )
+        {
             localRepo = retrieveLocalRepo( settingsFile );
         }
 
         if ( localRepo == null )
         {
-            localRepo = System.getProperty( "maven.repo.local", System.getProperty( "user.home" ) + "/.m2/repository" );
+            localRepo = System.getProperty( "user.home" ) + "/.m2/repository";
         }
 
         File repoDir = new File( localRepo );