Author: bentmann
Date: Sat May 31 01:56:54 2008
New Revision: 661979
URL: http://svn.apache.org/viewvc?rev=661979&view=rev
Log:
o Applied Maven code style
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationResult.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationResult.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/Invoker.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvokerLogger.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/SystemOutHandler.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/SystemOutLogger.java
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/SystemOutHandlerTest.java
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/SystemOutLoggerTest.java
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java?rev=661979&r1=661978&r2=661979&view=diff
==============================================================================
---
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java
(original)
+++
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java
Sat May 31 01:56:54 2008
@@ -32,28 +32,51 @@
{
private File basedir;
+
private boolean debug;
+
private InvocationOutputHandler errorHandler;
+
private String failureBehavior;
+
private List goals;
+
private InputStream inputStream;
+
private boolean interactive;
+
private File localRepository;
+
private boolean offline;
+
private boolean recursive = true;
+
private InvocationOutputHandler outputHandler;
+
private File pomFile;
+
private Properties properties;
+
private boolean showErrors;
+
private boolean updateSnapshots;
+
private boolean shellEnvironmentInherited = true;
+
private File userSettings;
+
private String globalChecksumPolicy;
+
private String pomFilename;
+
private File javaHome;
+
private List profiles;
+
private boolean nonPluginUpdates;
+
private Map shellEnvironments;
+
private String mavenOpts;
public InvocationRequest activateReactor( String[] includes, String[]
excludes )
@@ -238,7 +261,7 @@
public InvocationRequest setShellEnvironmentInherited( boolean
shellEnvironmentInherited )
{
- this.shellEnvironmentInherited = shellEnvironmentInherited;
+ this.shellEnvironmentInherited = shellEnvironmentInherited;
return this;
}
@@ -310,7 +333,7 @@
public InvocationRequest addShellEnvironment( String name, String value )
{
- if (this.shellEnvironmentInherited)
+ if ( this.shellEnvironmentInherited )
{
this.shellEnvironments = new HashMap();
}
@@ -333,4 +356,5 @@
this.mavenOpts = mavenOpts;
return this;
}
+
}
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationResult.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationResult.java?rev=661979&r1=661978&r2=661979&view=diff
==============================================================================
---
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationResult.java
(original)
+++
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationResult.java
Sat May 31 01:56:54 2008
@@ -21,32 +21,33 @@
import org.codehaus.plexus.util.cli.CommandLineException;
-public final class DefaultInvocationResult implements InvocationResult
+public final class DefaultInvocationResult
+ implements InvocationResult
{
-
+
private CommandLineException executionException;
-
+
private int exitCode = Integer.MIN_VALUE;
DefaultInvocationResult()
{
}
-
+
public int getExitCode()
{
return exitCode;
}
-
+
public CommandLineException getExecutionException()
{
return executionException;
}
-
+
void setExitCode( int exitCode )
{
this.exitCode = exitCode;
}
-
+
void setExecutionException( CommandLineException executionException )
{
this.executionException = executionException;
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java?rev=661979&r1=661978&r2=661979&view=diff
==============================================================================
---
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java
(original)
+++
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java
Sat May 31 01:56:54 2008
@@ -27,17 +27,15 @@
import org.codehaus.plexus.util.cli.Commandline;
/**
- * Class intended to be used by clients who wish to invoke a forked Maven
- * process from their applications
- *
- * @author jdcasey
+ * Class intended to be used by clients who wish to invoke a forked Maven
process from their applications
*
+ * @author jdcasey
* @plexus.component role="org.apache.maven.shared.invoker.Invoker"
role-hint="default"
*/
public class DefaultInvoker
implements Invoker
{
-
+
public static final String ROLE_HINT = "default";
private static final InvokerLogger DEFAULT_LOGGER = new SystemOutLogger();
@@ -62,31 +60,31 @@
throws MavenInvocationException
{
MavenCommandLineBuilder cliBuilder = new MavenCommandLineBuilder();
-
+
InvokerLogger logger = getLogger();
if ( logger != null )
{
cliBuilder.setLogger( getLogger() );
}
-
+
File localRepo = getLocalRepositoryDirectory();
if ( localRepo != null )
{
cliBuilder.setLocalRepositoryDirectory(
getLocalRepositoryDirectory() );
}
-
+
File mavenHome = getMavenHome();
if ( mavenHome != null )
{
cliBuilder.setMavenHome( getMavenHome() );
}
-
+
File workingDirectory = getWorkingDirectory();
if ( workingDirectory != null )
{
cliBuilder.setWorkingDirectory( getWorkingDirectory() );
}
-
+
Commandline cli;
try
{
@@ -96,27 +94,28 @@
{
throw new MavenInvocationException( "Error configuring
command-line. Reason: " + e.getMessage(), e );
}
-
+
DefaultInvocationResult result = new DefaultInvocationResult();
-
+
try
{
int exitCode = executeCommandLine( cli, request );
-
+
result.setExitCode( exitCode );
}
catch ( CommandLineException e )
{
result.setExecutionException( e );
}
-
+
return result;
}
- private int executeCommandLine( Commandline cli, InvocationRequest request
) throws CommandLineException
+ private int executeCommandLine( Commandline cli, InvocationRequest request
)
+ throws CommandLineException
{
int result = Integer.MIN_VALUE;
-
+
InputStream inputStream = request.getInputStream( this.inputStream );
InvocationOutputHandler outputHandler = request.getOutputHandler(
this.outputHandler );
InvocationOutputHandler errorHandler = request.getErrorHandler(
this.errorHandler );
@@ -129,8 +128,10 @@
{
if ( inputStream == null )
{
- getLogger().warn( "Maven will be executed in interactive mode,
but no input stream has been configured for this MavenInvoker instance." );
-
+ getLogger().warn(
+ "Maven will be executed in interactive mode"
+ + ", but no input stream has been
configured for this MavenInvoker instance." );
+
result = CommandLineUtils.executeCommandLine( cli,
outputHandler, errorHandler );
}
else
@@ -144,14 +145,13 @@
{
getLogger().info( "Executing in offline mode. The configured
input stream will be ignored." );
}
-
+
result = CommandLineUtils.executeCommandLine( cli, outputHandler,
errorHandler );
}
-
+
return result;
}
-
public File getLocalRepositoryDirectory()
{
return localRepositoryDirectory;
@@ -184,16 +184,16 @@
this.workingDirectory = workingDirectory;
return this;
}
-
+
public File getMavenHome()
{
return mavenHome;
}
-
+
public Invoker setMavenHome( File mavenHome )
{
this.mavenHome = mavenHome;
-
+
return this;
}
@@ -214,4 +214,5 @@
this.outputHandler = outputHandler;
return this;
}
+
}
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java?rev=661979&r1=661978&r2=661979&view=diff
==============================================================================
---
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
(original)
+++
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
Sat May 31 01:56:54 2008
@@ -30,6 +30,7 @@
*/
public interface InvocationRequest
{
+
boolean isInteractive();
boolean isOffline();
@@ -45,7 +46,7 @@
boolean isShellEnvironmentInherited();
boolean isNonPluginUpdates();
-
+
String getFailureBehavior();
File getLocalRepositoryDirectory( File defaultDirectory );
@@ -75,9 +76,9 @@
String getGlobalChecksumPolicy();
List getProfiles();
-
+
Map getShellEnvironments();
-
+
String getMavenOpts();
// ----------------------------------------------------------------------
@@ -143,12 +144,13 @@
InvocationRequest setUserSettingsFile( File userSettings );
InvocationRequest setGlobalChecksumPolicy( String globalChecksumPolicy );
-
- InvocationRequest setNonPluginUpdates( boolean nonPluginUpdates);
-
+
+ InvocationRequest setNonPluginUpdates( boolean nonPluginUpdates );
+
InvocationRequest setRecursive( boolean recursive );
-
+
InvocationRequest addShellEnvironment( String name, String value );
InvocationRequest setMavenOpts( String mavenOpts );
+
}
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationResult.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationResult.java?rev=661979&r1=661978&r2=661979&view=diff
==============================================================================
---
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationResult.java
(original)
+++
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationResult.java
Sat May 31 01:56:54 2008
@@ -22,13 +22,13 @@
import org.codehaus.plexus.util.cli.CommandLineException;
/**
- *
* @author jdcasey
*/
public interface InvocationResult
{
+
CommandLineException getExecutionException();
int getExitCode();
-
+
}
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/Invoker.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/Invoker.java?rev=661979&r1=661978&r2=661979&view=diff
==============================================================================
---
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/Invoker.java
(original)
+++
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/Invoker.java
Sat May 31 01:56:54 2008
@@ -24,34 +24,34 @@
public interface Invoker
{
-
+
String ROLE = Invoker.class.getName();
String userHome = System.getProperty( "user.home" );
InvocationResult execute( InvocationRequest request )
throws MavenInvocationException;
-
+
File getLocalRepositoryDirectory();
-
+
File getWorkingDirectory();
-
+
InvokerLogger getLogger();
File getMavenHome();
-
+
Invoker setMavenHome( File mavenHome );
-
+
Invoker setLocalRepositoryDirectory( File localRepositoryDirectory );
Invoker setLogger( InvokerLogger logger );
Invoker setWorkingDirectory( File workingDirectory );
-
+
Invoker setInputStream( InputStream inputStream );
-
+
Invoker setOutputHandler( InvocationOutputHandler outputHandler );
-
+
Invoker setErrorHandler( InvocationOutputHandler errorHandler );
-}
\ No newline at end of file
+}
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvokerLogger.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvokerLogger.java?rev=661979&r1=661978&r2=661979&view=diff
==============================================================================
---
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvokerLogger.java
(original)
+++
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvokerLogger.java
Sat May 31 01:56:54 2008
@@ -25,12 +25,17 @@
*/
public interface InvokerLogger
{
+
public static final int DEBUG = 4;
+
public static final int INFO = 3;
+
public static final int WARN = 2;
+
public static final int ERROR = 1;
+
public static final int FATAL = 0;
-
+
void debug( String message );
void debug( String message, Throwable throwable );
@@ -64,4 +69,5 @@
void setThreshold( int threshold );
int getThreshold();
+
}
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java?rev=661979&r1=661978&r2=661979&view=diff
==============================================================================
---
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
(original)
+++
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
Sat May 31 01:56:54 2008
@@ -36,6 +36,7 @@
*/
public class MavenCommandLineBuilder
{
+
private static final InvokerLogger DEFAULT_LOGGER = new SystemOutLogger();
private InvokerLogger logger = DEFAULT_LOGGER;
@@ -47,7 +48,7 @@
private File mavenHome;
private File mvnCommand;
-
+
private Properties systemEnvVars;
public Commandline build( InvocationRequest request )
@@ -103,7 +104,7 @@
}
protected void checkRequiredState()
- throws IOException
+ throws IOException
{
if ( logger == null )
{
@@ -111,8 +112,8 @@
}
if ( ( mavenHome == null ) && ( System.getProperty( "maven.home" ) ==
null ) )
- // can be restored with 1.5
- //&& ( System.getenv( "M2_HOME" ) != null ) )
+ // can be restored with 1.5
+ // && ( System.getenv( "M2_HOME" ) != null ) )
{
if ( !getSystemEnvVars().containsKey( "M2_HOME" ) )
{
@@ -168,9 +169,9 @@
}
else
{
- IllegalStateException error = new IllegalStateException(
-
"Unknown error retrieving shell environment variables. Reason: "
-
+ e.getMessage() );
+ IllegalStateException error =
+ new IllegalStateException( "Unknown error retrieving
shell environment variables. Reason: "
+ + e.getMessage() );
error.initCause( e );
throw error;
@@ -182,13 +183,13 @@
{
cli.addEnvironment( "JAVA_HOME",
request.getJavaHome().getAbsolutePath() );
}
-
+
if ( request.getMavenOpts() != null )
{
cli.addEnvironment( "MAVEN_OPTS", request.getMavenOpts() );
}
-
- for (Iterator iterator =
request.getShellEnvironments().keySet().iterator();iterator.hasNext();)
+
+ for ( Iterator iterator =
request.getShellEnvironments().keySet().iterator(); iterator.hasNext(); )
{
String key = (String) iterator.next();
String value = (String) request.getShellEnvironments().get( key );
@@ -287,8 +288,8 @@
if ( !"pom.xml".equals( pom.getName() ) )
{
- logger
- .debug( "Specified POM file is not named \'pom.xml\'.
Using the \'-f\' command-line option to accommodate non-standard filename..." );
+ logger.debug( "Specified POM file is not named \'pom.xml\'. "
+ + "Using the \'-f\' command-line option to accommodate
non-standard filename..." );
cli.createArgument().setValue( "-f" );
cli.createArgument().setValue( pom.getName() );
@@ -320,8 +321,7 @@
}
else if ( workingDirectory.isFile() )
{
- logger
- .warn( "Specified base directory (" + workingDirectory + ") is
a file. Using its parent directory..." );
+ logger.warn( "Specified base directory (" + workingDirectory + ")
is a file. Using its parent directory..." );
workingDirectory = workingDirectory.getParentFile();
}
@@ -424,7 +424,7 @@
{
cli.createArgument().setLine( "-c" );
}
- if (request.isNonPluginUpdates())
+ if ( request.isNonPluginUpdates() )
{
cli.createArgument().setLine( "-npu" );
}
@@ -495,9 +495,8 @@
}
/**
- * Wraps a path with quotes to handle paths with spaces. If no spaces are
found,
- * the original string is returned.
- *
+ * Wraps a path with quotes to handle paths with spaces. If no spaces are
found, the original string is returned.
+ *
* @param path string to wrap if containing spaces
* @return quote wrapped string
* @deprecated Quoting of command line arguments should be left to the
Commandline from plexus-utils.
@@ -513,7 +512,7 @@
return path;
}
}
-
+
private Properties getSystemEnvVars()
throws IOException
{
@@ -564,4 +563,5 @@
{
this.workingDirectory = workingDirectory;
}
+
}
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/SystemOutHandler.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/SystemOutHandler.java?rev=661979&r1=661978&r2=661979&view=diff
==============================================================================
---
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/SystemOutHandler.java
(original)
+++
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/SystemOutHandler.java
Sat May 31 01:56:54 2008
@@ -22,9 +22,9 @@
public class SystemOutHandler
implements InvocationOutputHandler
{
-
+
private boolean alwaysFlush;
-
+
public SystemOutHandler()
{
}
@@ -44,7 +44,7 @@
{
System.out.println( line );
}
-
+
if ( alwaysFlush )
{
System.out.flush();
Modified:
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/SystemOutLogger.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/SystemOutLogger.java?rev=661979&r1=661978&r2=661979&view=diff
==============================================================================
---
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/SystemOutLogger.java
(original)
+++
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/SystemOutLogger.java
Sat May 31 01:56:54 2008
@@ -25,7 +25,7 @@
public class SystemOutLogger
implements InvokerLogger
{
-
+
private int threshold = INFO;
public void debug( String message )
@@ -40,67 +40,67 @@
// don't log when it doesn't match your threshold.
return;
}
-
+
if ( message == null && error == null )
{
// don't log when there's nothing to log.
return;
}
-
+
StringBuffer buffer = new StringBuffer();
-
+
switch ( level )
{
- case( DEBUG ) :
+ case ( DEBUG ):
{
buffer.append( "[DEBUG]" );
break;
}
- case( INFO ) :
+ case ( INFO ):
{
buffer.append( "[INFO]" );
break;
}
- case( WARN ) :
+ case ( WARN ):
{
buffer.append( "[WARN]" );
break;
}
- case( ERROR ) :
+ case ( ERROR ):
{
buffer.append( "[ERROR]" );
break;
}
- case( FATAL ) :
+ case ( FATAL ):
{
buffer.append( "[FATAL]" );
break;
}
}
-
+
buffer.append( ' ' );
-
+
if ( message != null )
{
buffer.append( message );
}
-
+
if ( error != null )
{
StringWriter writer = new StringWriter();
PrintWriter pWriter = new PrintWriter( writer );
-
+
error.printStackTrace( pWriter );
-
+
if ( message != null )
{
buffer.append( '\n' );
}
-
+
buffer.append( "Error:\n" );
buffer.append( writer.toString() );
}
-
+
System.out.println( buffer.toString() );
}
Modified:
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java?rev=661979&r1=661978&r2=661979&view=diff
==============================================================================
---
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
(original)
+++
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
Sat May 31 01:56:54 2008
@@ -40,6 +40,7 @@
public class MavenCommandLineBuilderTest
extends TestCase
{
+
private List toDelete = new ArrayList();
private Properties sysProps;
@@ -50,13 +51,14 @@
String test = "noSpacesInHere";
assertSame( test, tcb.wrapStringWithQuotes( test ) );
- assertEquals("noSpacesInHere",tcb.wrapStringWithQuotes( test ));
+ assertEquals( "noSpacesInHere", tcb.wrapStringWithQuotes( test ) );
test = "bunch of spaces in here";
assertNotSame( test, tcb.wrapStringWithQuotes( test ) );
- assertEquals("\"bunch of spaces in here\"",tcb.wrapStringWithQuotes(
test ));
+ assertEquals( "\"bunch of spaces in here\"", tcb.wrapStringWithQuotes(
test ) );
}
+
public void testShouldFailToSetLocalRepoLocationGloballyWhenItIsAFile()
throws IOException
{
@@ -458,8 +460,9 @@
TestCommandLineBuilder tcb = new TestCommandLineBuilder();
Commandline cli = new Commandline();
- tcb.setReactorBehavior( new DefaultInvocationRequest()
- .setFailureBehavior( InvocationRequest.REACTOR_FAIL_AT_END ), cli
);
+ tcb.setReactorBehavior(
+ new
DefaultInvocationRequest().setFailureBehavior(
InvocationRequest.REACTOR_FAIL_AT_END ),
+ cli );
assertArgumentsPresent( Collections.singleton( "-fae" ), cli );
}
@@ -471,8 +474,9 @@
TestCommandLineBuilder tcb = new TestCommandLineBuilder();
Commandline cli = new Commandline();
- tcb.setReactorBehavior( new DefaultInvocationRequest()
- .setFailureBehavior( InvocationRequest.REACTOR_FAIL_NEVER ), cli );
+ tcb.setReactorBehavior(
+ new
DefaultInvocationRequest().setFailureBehavior(
InvocationRequest.REACTOR_FAIL_NEVER ),
+ cli );
assertArgumentsPresent( Collections.singleton( "-fn" ), cli );
}
@@ -484,9 +488,9 @@
TestCommandLineBuilder tcb = new TestCommandLineBuilder();
Commandline cli = new Commandline();
- tcb
- .setReactorBehavior( new DefaultInvocationRequest()
- .setFailureBehavior( InvocationRequest.REACTOR_FAIL_FAST ),
cli );
+ tcb.setReactorBehavior(
+ new
DefaultInvocationRequest().setFailureBehavior(
InvocationRequest.REACTOR_FAIL_FAST ),
+ cli );
Set banned = new HashSet();
banned.add( "-fae" );
@@ -674,8 +678,8 @@
Commandline cli = new Commandline();
- InvocationRequest req = new
DefaultInvocationRequest().setBaseDirectory( projectDir )
- .setPomFileName( "non-standard-pom.xml" );
+ InvocationRequest req =
+ new DefaultInvocationRequest().setBaseDirectory( projectDir
).setPomFileName( "non-standard-pom.xml" );
TestCommandLineBuilder tcb = new TestCommandLineBuilder();
tcb.setEnvironmentPaths( req, cli );
@@ -735,7 +739,7 @@
}
public void testShouldSpecifyCustomPropertyWithSpacesInValueFromRequest()
- throws IOException
+ throws IOException
{
logTestStart();
@@ -751,7 +755,7 @@
}
public void testShouldSpecifyCustomPropertyWithSpacesInKeyFromRequest()
- throws IOException
+ throws IOException
{
logTestStart();
@@ -869,7 +873,9 @@
assertEquals( projectDir.getCanonicalPath(),
commandline.getWorkingDirectory().getCanonicalPath() );
}
- public void testShouldSetEnvVar_MAVEN_TERMINATE_CMD() throws Exception {
+ public void testShouldSetEnvVar_MAVEN_TERMINATE_CMD()
+ throws Exception
+ {
logTestStart();
File mavenDir = setupTempMavenHomeIfMissing();
@@ -899,12 +905,13 @@
for ( int i = 0; i < environmentVariables.length; i++ )
{
String envVar = environmentVariables[i];
- if (envVar.startsWith( "MAVEN_TERMINATE_CMD=" )) {
+ if ( envVar.startsWith( "MAVEN_TERMINATE_CMD=" ) )
+ {
envVarMavenTerminateCmd = envVar;
break;
}
}
- assertEquals( "MAVEN_TERMINATE_CMD=on", envVarMavenTerminateCmd);
+ assertEquals( "MAVEN_TERMINATE_CMD=on", envVarMavenTerminateCmd );
}
@@ -926,7 +933,6 @@
MavenCommandLineBuilder commandLineBuilder = new
MavenCommandLineBuilder();
-
Commandline commandline = commandLineBuilder.build( request );
assertArgumentsPresent( Collections.singleton( "-P" + profile1 + "," +
profile2 ), commandline );
@@ -979,11 +985,12 @@
int expectedCounter = 0;
-// System.out.println( "Command-line has " + arguments.length + "
arguments." );
+ // System.out.println( "Command-line has " + arguments.length + "
arguments." );
for ( int i = 0; i < arguments.length; i++ )
{
-// System.out.println( "Checking argument: " + arguments[i] + "
against: " + expected.get( expectedCounter ) );
+ // System.out.println( "Checking argument: " + arguments[i] + "
against: " + expected.get( expectedCounter )
+ // );
if ( arguments[i].equals( expected.get( expectedCounter ) ) )
{
@@ -1000,8 +1007,8 @@
String[] argv = cli.getArguments();
List args = Arrays.asList( argv );
-// System.out.println( "Command-line: " + cli );
-// System.out.println( "Arguments: " + args );
+ // System.out.println( "Command-line: " + cli );
+ // System.out.println( "Arguments: " + args );
for ( Iterator it = requiredArgs.iterator(); it.hasNext(); )
{
@@ -1049,7 +1056,7 @@
extends MavenCommandLineBuilder
{
public void checkRequiredState()
- throws IOException
+ throws IOException
{
super.checkRequiredState();
}
@@ -1108,4 +1115,5 @@
{
return new File( System.getProperty( "java.io.tmpdir" )
).getCanonicalFile();
}
+
}
Modified:
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/SystemOutHandlerTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/SystemOutHandlerTest.java?rev=661979&r1=661978&r2=661979&view=diff
==============================================================================
---
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/SystemOutHandlerTest.java
(original)
+++
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/SystemOutHandlerTest.java
Sat May 31 01:56:54 2008
@@ -30,19 +30,19 @@
logTestStart();
new SystemOutHandler( false ).consumeLine( "This is a test." );
}
-
+
public void testConsumeWithAlwaysFlush()
{
logTestStart();
new SystemOutHandler( true ).consumeLine( "This is a test." );
}
-
+
public void testConsumeNullLine()
{
logTestStart();
new SystemOutHandler().consumeLine( null );
}
-
+
// this is just a debugging helper for separating unit test output...
private void logTestStart()
{
@@ -51,4 +51,5 @@
System.out.println( "Starting: " + element.getMethodName() );
}
+
}
Modified:
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/SystemOutLoggerTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/SystemOutLoggerTest.java?rev=661979&r1=661978&r2=661979&view=diff
==============================================================================
---
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/SystemOutLoggerTest.java
(original)
+++
maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/SystemOutLoggerTest.java
Sat May 31 01:56:54 2008
@@ -26,9 +26,10 @@
public class SystemOutLoggerTest
extends TestCase
{
-
- private static final Throwable EXCEPTION = new MalformedURLException(
"This is meant to happen. It's part of the test." );
-
+
+ private static final Throwable EXCEPTION =
+ new MalformedURLException( "This is meant to happen. It's part of the
test." );
+
private static final String MESSAGE = "This is a test message.";
public void testDebugWithMessageOnly()
@@ -36,13 +37,13 @@
logTestStart();
new SystemOutLogger().debug( MESSAGE );
}
-
+
public void testDebugWithMessageAndError()
{
logTestStart();
new SystemOutLogger().debug( MESSAGE, EXCEPTION );
}
-
+
public void testDebugWithNullMessageAndNoError()
{
logTestStart();
@@ -66,13 +67,13 @@
logTestStart();
new SystemOutLogger().info( MESSAGE );
}
-
+
public void testInfoWithMessageAndError()
{
logTestStart();
new SystemOutLogger().info( MESSAGE, EXCEPTION );
}
-
+
public void testInfoWithNullMessageAndNoError()
{
logTestStart();
@@ -96,13 +97,13 @@
logTestStart();
new SystemOutLogger().warn( MESSAGE );
}
-
+
public void testWarnWithMessageAndError()
{
logTestStart();
new SystemOutLogger().warn( MESSAGE, EXCEPTION );
}
-
+
public void testWarnWithNullMessageAndNoError()
{
logTestStart();
@@ -126,13 +127,13 @@
logTestStart();
new SystemOutLogger().error( MESSAGE );
}
-
+
public void testErrorWithMessageAndError()
{
logTestStart();
new SystemOutLogger().error( MESSAGE, EXCEPTION );
}
-
+
public void testErrorWithNullMessageAndNoError()
{
logTestStart();
@@ -156,13 +157,13 @@
logTestStart();
new SystemOutLogger().fatalError( MESSAGE );
}
-
+
public void testFatalErrorWithMessageAndError()
{
logTestStart();
new SystemOutLogger().fatalError( MESSAGE, EXCEPTION );
}
-
+
public void testFatalErrorWithNullMessageAndNoError()
{
logTestStart();
@@ -249,4 +250,5 @@
System.out.println( "Starting: " + element.getMethodName() );
}
+
}
