You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/07/26 04:48:23 UTC
svn commit: r679948 - in
/maven/shared/branches/embedder-verifier/src/main/java/org/apache/maven/it:
DefaultInvoker.java Verifier.java
Author: jvanzyl
Date: Fri Jul 25 19:48:21 2008
New Revision: 679948
URL: http://svn.apache.org/viewvc?rev=679948&view=rev
Log: (empty)
Modified:
maven/shared/branches/embedder-verifier/src/main/java/org/apache/maven/it/DefaultInvoker.java
maven/shared/branches/embedder-verifier/src/main/java/org/apache/maven/it/Verifier.java
Modified: maven/shared/branches/embedder-verifier/src/main/java/org/apache/maven/it/DefaultInvoker.java
URL: http://svn.apache.org/viewvc/maven/shared/branches/embedder-verifier/src/main/java/org/apache/maven/it/DefaultInvoker.java?rev=679948&r1=679947&r2=679948&view=diff
==============================================================================
--- maven/shared/branches/embedder-verifier/src/main/java/org/apache/maven/it/DefaultInvoker.java (original)
+++ maven/shared/branches/embedder-verifier/src/main/java/org/apache/maven/it/DefaultInvoker.java Fri Jul 25 19:48:21 2008
@@ -15,7 +15,6 @@
* the License.
*/
-import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
@@ -43,9 +42,6 @@
{
private static final String LOG_FILENAME = "log.txt";
public String localRepo;
- private final ByteArrayOutputStream outStream = new ByteArrayOutputStream();
- private final ByteArrayOutputStream errStream = new ByteArrayOutputStream();
- private PrintStream originalOut;
private boolean autoclean = true;
private boolean debug;
private String defaultMavenHome;
@@ -53,6 +49,8 @@
public void invoke( InvocationRequest request )
throws VerificationException
{
+ System.out.println( "------> " + request.getGoals() ) ;
+
List goals = Arrays.asList( StringUtils.split( request.getGoals(), "," ) );
if ( goals.size() == 0 )
@@ -94,9 +92,7 @@
{
String key = String.valueOf( it.next() );
- String resolvedArg = resolveCommandLineArg( key, request.getBasedir() );
-
- cli.createArgument().setLine( resolvedArg );
+ cli.createArgument().setLine( key );
}
cli.createArgument().setValue( "-e" );
@@ -113,10 +109,14 @@
for ( Iterator i = allGoals.iterator(); i.hasNext(); )
{
- cli.createArgument().setValue( (String) i.next() );
+ String argument = (String) i.next();
+ System.out.println(argument);
+ cli.createArgument().setValue( argument.trim() );
}
- // System.out.println( "Command: " + Commandline.toString( cli.getCommandline() ) );
+ FileUtils.fileWrite( "/tmp/data.txt", Commandline.toString( cli.getCommandline() ) );
+
+ System.out.println( "Command: " + Commandline.toString( cli.getCommandline() ) );
ret = runCommandLine( System.getProperty( "maven.home" ), cli, logFile );
}
@@ -258,18 +258,6 @@
}
}
- private String resolveCommandLineArg( String key, String basedir )
- {
- String result = key.replaceAll( "\\$\\{basedir\\}", basedir );
- if ( result.indexOf( "\\\\" ) >= 0 )
- {
- result = result.replaceAll( "\\\\", "\\" );
- }
- result = result.replaceAll( "\\/\\/", "\\/" );
-
- return result;
- }
-
public boolean isAutoclean()
{
return autoclean;
Modified: maven/shared/branches/embedder-verifier/src/main/java/org/apache/maven/it/Verifier.java
URL: http://svn.apache.org/viewvc/maven/shared/branches/embedder-verifier/src/main/java/org/apache/maven/it/Verifier.java?rev=679948&r1=679947&r2=679948&view=diff
==============================================================================
--- maven/shared/branches/embedder-verifier/src/main/java/org/apache/maven/it/Verifier.java (original)
+++ maven/shared/branches/embedder-verifier/src/main/java/org/apache/maven/it/Verifier.java Fri Jul 25 19:48:21 2008
@@ -16,7 +16,6 @@
*/
import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -24,7 +23,6 @@
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
-import java.io.PrintStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -62,15 +60,39 @@
private static final String LOG_FILENAME = "log.txt";
public String localRepo;
private final String basedir;
- private final ByteArrayOutputStream outStream = new ByteArrayOutputStream();
- private final ByteArrayOutputStream errStream = new ByteArrayOutputStream();
- private PrintStream originalOut;
- private PrintStream originalErr;
- private boolean autoclean = true;
private static String localRepoLayout = "default";
-
private boolean debug;
+ // Constructors
+
+ public Verifier( String basedir )
+ throws VerificationException
+ {
+ this( basedir, null );
+ }
+
+ public Verifier( String basedir, boolean debug )
+ throws VerificationException
+ {
+ this( basedir, null, debug );
+ }
+
+ public Verifier( String basedir, String settingsFile )
+ throws VerificationException
+ {
+ this( basedir, settingsFile, false );
+ }
+
+ public Verifier( String basedir, String settingsFile, boolean debug )
+ throws VerificationException
+ {
+ this.basedir = basedir;
+ this.debug = debug;
+
+ findLocalRepo( settingsFile );
+ findDefaultMavenHome();
+ }
+
// Execution
Invoker invoker = new DefaultInvoker();
@@ -101,7 +123,7 @@
{
invoker.invoke( request );
}
-
+
public String getMavenVersion()
throws VerificationException
{
@@ -115,34 +137,6 @@
//
- public Verifier( String basedir, String settingsFile )
- throws VerificationException
- {
- this( basedir, settingsFile, false );
- }
-
- public Verifier( String basedir, String settingsFile, boolean debug )
- throws VerificationException
- {
- this.basedir = basedir;
-
- this.debug = debug;
-
- if ( !debug )
- {
- originalOut = System.out;
-
- System.setOut( new PrintStream( outStream ) );
-
- originalErr = System.err;
-
- System.setErr( new PrintStream( errStream ) );
- }
-
- findLocalRepo( settingsFile );
- findDefaultMavenHome();
- }
-
private void findDefaultMavenHome()
throws VerificationException
{
@@ -157,26 +151,8 @@
}
}
- public Verifier( String basedir )
- throws VerificationException
- {
- this( basedir, null );
- }
-
- public Verifier( String basedir, boolean debug )
- throws VerificationException
- {
- this( basedir, null, debug );
- }
-
public void resetStreams()
{
- if ( !debug )
- {
- System.setOut( originalOut );
-
- System.setErr( originalErr );
- }
}
public void verifyErrorFreeLog()
@@ -433,7 +409,6 @@
if ( settingsXmlPath != null )
{
- System.out.println( "Using settings from " + settingsXmlPath );
userXml = new File( settingsXmlPath );
}
else
@@ -796,16 +771,6 @@
}
}
- public boolean isAutoclean()
- {
- return autoclean;
- }
-
- public void setAutoclean( boolean autoclean )
- {
- this.autoclean = autoclean;
- }
-
public String getBasedir()
{
return basedir;