From 96dfb0ba8f83c9d195049e5091201ce4f1f1c4a1 Mon Sep 17 00:00:00 2001 From: Brett Leslie Porter Date: Tue, 26 Jul 2005 05:13:27 +0000 Subject: [PATCH] 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 --- .../java/org/apache/maven/it/Verifier.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java b/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java index a5ce4a602b..bb671827b6 100644 --- a/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java +++ b/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java @@ -187,7 +187,7 @@ private static List loadFile( File file ) throw new VerificationException( e ); } } - + return lines; } @@ -465,7 +465,7 @@ public void executeGoals( Properties properties, String filename ) String mavenHome = System.getProperty( "maven.home" ); List goals = loadFile( basedir, filename ); - + List cliOptions = loadFile( basedir, "cli-options.txt" ); if ( goals.size() == 0 ) @@ -498,20 +498,20 @@ public void executeGoals( Properties properties, String filename ) } cli.setExecutable( executable ); - + for ( Iterator it = cliOptions.iterator(); it.hasNext(); ) { String key = (String) it.next(); - cli.createArgument().setValue(key); + cli.createArgument().setLine( key ); } cli.createArgument().setValue( "-e" ); // cli.createArgument().setValue( "-X" ); - + cli.createArgument().setValue( "--no-plugin-registry" ); - + cli.createArgument().setValue( "--check-plugin-latest" ); - + cli.createArgument().setValue( "--batch-mode" ); for ( Iterator i = properties.keySet().iterator(); i.hasNext(); ) @@ -519,9 +519,9 @@ public void executeGoals( Properties properties, String filename ) String key = (String) i.next(); cli.createArgument().setLine( "-D" + key + "=" + properties.getProperty( key ) ); } - - // Note: Make sure that the repo is surrounded by quotes as it can possibly have - // spaces in its path. + + // Note: Make sure that the repo is surrounded by quotes as it can possibly have + // spaces in its path. cli.createArgument().setLine( "-Dmaven.repo.local=" + "\"" + localRepo + "\"" ); for ( Iterator i = allGoals.iterator(); i.hasNext(); ) @@ -581,7 +581,7 @@ private void displayLogFile() public static void main( String args[] ) { String basedir = System.getProperty( "user.dir" ); - + localRepo = retrieveLocalRepo(); List tests = null; @@ -619,7 +619,7 @@ public static void main( String args[] ) verifier.executeHook( "prebuild-hook.txt" ); Properties properties = verifier.loadProperties( "system.properties" ); - + Properties controlProperties = verifier.loadProperties( "verifier.properties" ); boolean chokeOnErrorOutput = Boolean.valueOf( controlProperties.getProperty( "failOnErrorOutput", "true" ) ).booleanValue();