You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2009/08/19 12:51:01 UTC
svn commit: r805744 - in /maven/plugins/trunk/maven-javadoc-plugin/src:
main/java/org/apache/maven/plugin/javadoc/
test/java/org/apache/maven/plugin/javadoc/
Author: vsiveton
Date: Wed Aug 19 10:51:01 2009
New Revision: 805744
URL: http://svn.apache.org/viewvc?rev=805744&view=rev
Log:
o using FileUtils.createTempFile() for invoker logs files
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=805744&r1=805743&r2=805744&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java Wed Aug 19 10:51:01 2009
@@ -595,13 +595,17 @@
String clirrGoal = getFullClirrGoal();
// http://mojo.codehaus.org/clirr-maven-plugin/check-mojo.html
- File clirrTextOutputFile = new File( project.getBuild().getDirectory(), "clirr.txt" );
+ File clirrTextOutputFile =
+ FileUtils.createTempFile( "clirr", ".txt", new File( project.getBuild().getDirectory() ) );
Properties properties = new Properties();
properties.put( "textOutputFile", clirrTextOutputFile.getAbsolutePath() );
properties.put( "comparisonVersion", comparisonVersion );
properties.put( "failOnError", "false" );
- File invokerLogFile = new File( project.getBuild().getDirectory(), "invoker-clirr-maven-plugin.txt" );
+ File invokerDir = new File( project.getBuild().getDirectory(), "invoker" );
+ invokerDir.mkdirs();
+ File invokerLogFile = FileUtils.createTempFile( "clirr-maven-plugin", ".txt", invokerDir );
+ new File( project.getBuild().getDirectory(), "invoker-clirr-maven-plugin.txt" );
JavadocUtil.invokeMaven( getLog(), new File( localRepository.getBasedir() ), project.getFile(),
Collections.singletonList( clirrGoal ), properties, invokerLogFile );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=805744&r1=805743&r2=805744&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Wed Aug 19 10:51:01 2009
@@ -4459,7 +4459,6 @@
List modulesLinks = new ArrayList();
String javadocDirRelative = PathUtils.toRelative( project.getBasedir(), getOutputDirectory() );
- int i = 0;
for ( Iterator it = reactorProjects.iterator(); it.hasNext(); )
{
MavenProject p = (MavenProject) it.next();
@@ -4485,8 +4484,9 @@
+ "' has not be previously called for the project: '" + p.getId()
+ "'. Trying to invoke it..." );
- File invokerLogFile =
- new File( project.getBuild().getDirectory(), "invoker-maven-javadoc-plugin-" + i + ".txt" );
+ File invokerDir = new File( project.getBuild().getDirectory(), "invoker" );
+ invokerDir.mkdirs();
+ File invokerLogFile = FileUtils.createTempFile( "maven-javadoc-plugin", ".txt", invokerDir );
JavadocUtil.invokeMaven( getLog(), new File( localRepository.getBasedir() ), p.getFile(),
Collections.singletonList( javadocGoal ), null, invokerLogFile );
}
@@ -4504,8 +4504,6 @@
modulesLinks.add( ol );
}
}
-
- i++;
}
return modulesLinks;
@@ -4783,6 +4781,7 @@
*/
private static String getPluginParameter( MavenProject p, String pluginId, String param )
{
+// p.getGoalConfiguration( pluginGroupId, pluginArtifactId, executionId, goalId );
Plugin plugin = getPlugin( p, pluginId );
if ( plugin != null )
{
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java?rev=805744&r1=805743&r2=805744&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java Wed Aug 19 10:51:01 2009
@@ -619,8 +619,9 @@
List goals = new ArrayList();
goals.add( "clean" );
goals.add( "compile" );
-
- File invokerLogFile = new File( getBasedir(), "target/invoker-FixJavadocMojoTest.txt" );
+ File invokerDir = new File( getBasedir(), "target/invoker" );
+ invokerDir.mkdirs();
+ File invokerLogFile = FileUtils.createTempFile( "FixJavadocMojoTest", ".txt", invokerDir );
JavadocUtil.invokeMaven( log, new File( getBasedir(), "target/local-repo" ), testPom, goals, null,
invokerLogFile );
}