Author: hboutemy
Date: Sun Mar 30 04:38:14 2008
New Revision: 642715
URL: http://svn.apache.org/viewvc?rev=642715&view=rev
Log:
removed tabs or unwanted spaces (no code change)
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/FileLogger.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerMojoTest.java
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java?rev=642715&r1=642714&r2=642715&view=diff
==============================================================================
---
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java
Sun Mar 30 04:38:14 2008
@@ -175,7 +175,4 @@
{
throw new UnsupportedOperationException();
}
-
-
-
}
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/FileLogger.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/FileLogger.java?rev=642715&r1=642714&r2=642715&view=diff
==============================================================================
---
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/FileLogger.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/FileLogger.java
Sun Mar 30 04:38:14 2008
@@ -31,25 +31,25 @@
public class FileLogger
implements InvocationOutputHandler
{
-
+
private PrintStream stream;
-
+
private boolean shouldFinalize = true;
private final Log log;
-
+
public FileLogger( File outputFile )
throws IOException
{
this( outputFile, null );
}
-
+
public FileLogger( File outputFile, Log log )
throws IOException
{
this.log = log;
stream = new PrintStream( new FileOutputStream( outputFile ) );
-
+
Runnable finalizer = new Runnable()
{
public void run()
@@ -63,7 +63,7 @@
}
}
};
-
+
Runtime.getRuntime().addShutdownHook( new Thread( finalizer ) );
}
@@ -76,23 +76,23 @@
{
stream.println( line );
stream.flush();
-
+
if ( log != null )
{
log.info( line );
}
}
-
+
public void close()
{
if ( stream != null )
{
stream.flush();
}
-
+
IOUtil.close( stream );
}
-
+
public void finalize()
{
if ( shouldFinalize )
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java?rev=642715&r1=642714&r2=642715&view=diff
==============================================================================
---
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
Sun Mar 30 04:38:14 2008
@@ -187,13 +187,13 @@
*/
private Properties testProperties;
- /**
- * Common set of properties to pass in on each project's command line,
via -D parameters.
- *
- * @parameter
- * @since 1.1
- */
- private Map properties;
+ /**
+ * Common set of properties to pass in on each project's command line, via
-D parameters.
+ *
+ * @parameter
+ * @since 1.1
+ */
+ private Map properties;
/**
* Whether to show errors in the build output.
@@ -223,15 +223,15 @@
* @since 1.1
*/
private List profiles;
-
+
/**
* List properties which will be used to interpolate goal files.
- *
+ *
* @parameter
* @since 1.1
- */
+ */
private Properties interpolationsProperties;
-
+
/**
* The Maven Project Object
*
@@ -240,8 +240,8 @@
* @readonly
* @since 1.1
*/
- private MavenProject project;
-
+ private MavenProject project;
+
/**
* Specify this parameter to run individual tests by file name, overriding
the <code>pomIncludes</code>
* and <code>pomExcludes</code> parameters. Each pattern you specify here
will be used to create an
@@ -249,9 +249,9 @@
* so you can just type "-Dinvoker.test=MyTest" to run a single it in
${projectsDirectory}/${invoker.test}".
* @parameter expression="${invoker.test}"
* @since 1.1
- */
+ */
private String invokerTest;
-
+
/**
* The name of the project-specific file that contains the enumeration of
profiles to use for that test.
* <b>If the file exists and empty no profiles will be used even if the
profiles is set</b>
@@ -259,7 +259,7 @@
* @since 1.1
*/
private String profilesFile;
-
+
/**
* Path to an alternate settings.xml to use for maven invocation with all
ITs
*
@@ -339,7 +339,7 @@
runBuild( projectsDir, pom, failures );
}
-
+
if ( !suppressSummaries )
{
@@ -448,7 +448,7 @@
private void runBuild( final File projectsDir, final String pom, final
List failures )
throws MojoExecutionException
{
-
+
File pomFile = new File( projectsDir, pom );
final File basedir = pomFile.getParentFile();
File interpolatedPomFile = buildInterpolatedPomFile( pomFile, basedir
);
@@ -576,7 +576,7 @@
request.setPomFile( interpolatedPomFile );
request.setProfiles( getProfiles(basedir) );
-
+
if ( settingsFile != null )
{
request.setUserSettingsFile( settingsFile );
@@ -779,7 +779,7 @@
{
String errorMessage = "error evaluating script " +
basedir.getPath() + File.separatorChar
+ postBuildHookScript + ", " + e.getMessage();
- getLog().error( errorMessage, e );
+ getLog().error( errorMessage, e );
result = false;
}
}
@@ -823,14 +823,14 @@
{
String[] testRegexes = StringUtils.split( invokerTest, "," );
List /* String */includes = new ArrayList( testRegexes.length );
-
+
for ( int i = 0, size = testRegexes.length; i < size; i++ )
{
// user just use -Dinvoker.test=MWAR191,MNG111 to use a
directory thats the end is not pom.xml
includes.add( testRegexes[i].endsWith( "pom.xml" ) ?
testRegexes[i] : testRegexes[i]
+ File.separatorChar + "pom.xml" );
}
-
+
final FileSet fs = new FileSet();
fs.setIncludes( includes );
@@ -842,7 +842,7 @@
final FileSetManager fsm = new FileSetManager( getLog() );
poms = fsm.getIncludedFiles( fs );
- }
+ }
else
{
final FileSet fs = new FileSet();
@@ -862,7 +862,7 @@
return poms;
}
-
+
private String[] normalizePomPaths( String[] poms )
throws IOException
{
@@ -974,7 +974,7 @@
return result;
}
-
+
protected File buildInterpolatedPomFile( File pomFile, File
targetDirectory )
throws MojoExecutionException
{
@@ -1035,7 +1035,7 @@
}
return interpolatedPomFile;
}
-
+
protected List getProfiles( File projectDirectory )
throws MojoExecutionException
{
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerMojoTest.java?rev=642715&r1=642714&r2=642715&view=diff
==============================================================================
---
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerMojoTest.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerMojoTest.java
Sun Mar 30 04:38:14 2008
@@ -50,7 +50,7 @@
List goals = invokerMojo.getGoals( new File( dirPath ) );
assertEquals( 3, goals.size() );
}
-
+
public void testSimpleRunValidate()
throws Exception
{
@@ -75,7 +75,7 @@
setVariableValueToObject( invokerMojo, "postBuildHookScript",
"verify.bsh" );
invokerMojo.execute();
}
-
+
public void testSingleInvokerTest()
throws Exception
{
@@ -104,8 +104,8 @@
String[] poms = invokerMojo.getPoms();
System.out.println( Arrays.asList( poms ) );
assertEquals( 2, poms.length );
- }
-
+ }
+
public void testFullPatternInvokerTest()
throws Exception
{
@@ -119,6 +119,5 @@
String[] poms = invokerMojo.getPoms();
System.out.println( Arrays.asList( poms ) );
assertEquals( 3, poms.length );
- }
-
+ }
}
