Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lines may have spaces - use setLine instead of setValue 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225233 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-07-26 05:13:27 +00:00
parent 4b1038de53
commit 96dfb0ba8f
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java
View File

@ -187,7 +187,7 @@ public class Verifier
throw new VerificationException( e ); throw new VerificationException( e );
} }
} }
return lines; return lines;
} }
@ -465,7 +465,7 @@ public class Verifier
String mavenHome = System.getProperty( "maven.home" ); String mavenHome = System.getProperty( "maven.home" );
List goals = loadFile( basedir, filename ); List goals = loadFile( basedir, filename );
List cliOptions = loadFile( basedir, "cli-options.txt" ); List cliOptions = loadFile( basedir, "cli-options.txt" );
if ( goals.size() == 0 ) if ( goals.size() == 0 )
@ -498,20 +498,20 @@ public class Verifier
} }
cli.setExecutable( executable ); cli.setExecutable( executable );
for ( Iterator it = cliOptions.iterator(); it.hasNext(); ) for ( Iterator it = cliOptions.iterator(); it.hasNext(); )
{ {
String key = (String) it.next(); String key = (String) it.next();
cli.createArgument().setValue(key); cli.createArgument().setLine( key );
} }
cli.createArgument().setValue( "-e" ); cli.createArgument().setValue( "-e" );
// cli.createArgument().setValue( "-X" ); // cli.createArgument().setValue( "-X" );
cli.createArgument().setValue( "--no-plugin-registry" ); cli.createArgument().setValue( "--no-plugin-registry" );
cli.createArgument().setValue( "--check-plugin-latest" ); cli.createArgument().setValue( "--check-plugin-latest" );
cli.createArgument().setValue( "--batch-mode" ); cli.createArgument().setValue( "--batch-mode" );
for ( Iterator i = properties.keySet().iterator(); i.hasNext(); ) for ( Iterator i = properties.keySet().iterator(); i.hasNext(); )
@ -519,9 +519,9 @@ public class Verifier
String key = (String) i.next(); String key = (String) i.next();
cli.createArgument().setLine( "-D" + key + "=" + properties.getProperty( key ) ); cli.createArgument().setLine( "-D" + key + "=" + properties.getProperty( key ) );
} }
// Note: Make sure that the repo is surrounded by quotes as it can possibly have // Note: Make sure that the repo is surrounded by quotes as it can possibly have
// spaces in its path. // spaces in its path.
cli.createArgument().setLine( "-Dmaven.repo.local=" + "\"" + localRepo + "\"" ); cli.createArgument().setLine( "-Dmaven.repo.local=" + "\"" + localRepo + "\"" );
for ( Iterator i = allGoals.iterator(); i.hasNext(); ) for ( Iterator i = allGoals.iterator(); i.hasNext(); )
@ -581,7 +581,7 @@ public class Verifier
public static void main( String args[] ) public static void main( String args[] )
{ {
String basedir = System.getProperty( "user.dir" ); String basedir = System.getProperty( "user.dir" );
localRepo = retrieveLocalRepo(); localRepo = retrieveLocalRepo();
List tests = null; List tests = null;
@ -619,7 +619,7 @@ public class Verifier
verifier.executeHook( "prebuild-hook.txt" ); verifier.executeHook( "prebuild-hook.txt" );
Properties properties = verifier.loadProperties( "system.properties" ); Properties properties = verifier.loadProperties( "system.properties" );
Properties controlProperties = verifier.loadProperties( "verifier.properties" ); Properties controlProperties = verifier.loadProperties( "verifier.properties" );
boolean chokeOnErrorOutput = Boolean.valueOf( controlProperties.getProperty( "failOnErrorOutput", "true" ) ).booleanValue(); boolean chokeOnErrorOutput = Boolean.valueOf( controlProperties.getProperty( "failOnErrorOutput", "true" ) ).booleanValue();