stephenc
/
maven-plugin-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed inconsistency between source file location and package name used when ant mojo 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1405262 13f79535-47bb-0310-9956-ffa450edef68
master
Herve Boutemy 2012-11-03 02:32:14 +00:00
parent 92df3b3987
commit 62dca6fbd5
1 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
View File

@ -207,13 +207,12 @@ public class PluginHelpGenerator
*/ */
private String getImplementation( PluginDescriptor pluginDescriptor ) private String getImplementation( PluginDescriptor pluginDescriptor )
{ {
String packageName = helpPackageName; if ( StringUtils.isEmpty( helpPackageName ) )
if ( StringUtils.isEmpty( packageName ) )
{ {
packageName = GeneratorUtils.discoverPackageName( pluginDescriptor ); helpPackageName = GeneratorUtils.discoverPackageName( pluginDescriptor );
} }
return StringUtils.isEmpty( packageName ) ? HELP_MOJO_CLASS_NAME : packageName + '.' + HELP_MOJO_CLASS_NAME; return StringUtils.isEmpty( helpPackageName ) ? HELP_MOJO_CLASS_NAME : helpPackageName + '.' + HELP_MOJO_CLASS_NAME;
} }
/** /**
@ -318,35 +317,32 @@ public class PluginHelpGenerator
// rewrite help mojo source // rewrite help mojo source
File helpSourceFile = new File( destinationDirectory, HELP_MOJO_CLASS_NAME + ".java" ); File helpSourceFile = new File( destinationDirectory, HELP_MOJO_CLASS_NAME + ".java" );
if ( helpSourceFile.exists() ) File helpSourceFileNew = new File( destinationDirectory, packageAsDirectory + '/' + HELP_MOJO_CLASS_NAME + ".java" );
if ( !helpSourceFileNew.getParentFile().exists() )
{ {
File helpSourceFileNew = new File( destinationDirectory, packageAsDirectory + '/' + HELP_MOJO_CLASS_NAME + ".java" ); helpSourceFileNew.getParentFile().mkdirs();
if ( !helpSourceFileNew.getParentFile().exists() )
{
helpSourceFileNew.getParentFile().mkdirs();
}
Reader sourceReader = null;
PrintWriter sourceWriter = null;
try
{
sourceReader = new FileReader( helpSourceFile ); // FIXME platform encoding
sourceWriter = new PrintWriter( new FileWriter( helpSourceFileNew ) ); // FIXME platform encoding
sourceWriter.println( "package " + destinationPackage + ";" );
IOUtil.copy( sourceReader, sourceWriter );
}
catch ( IOException e )
{
throw new GeneratorException( e.getMessage(), e );
}
finally
{
IOUtil.close( sourceReader );
IOUtil.close( sourceWriter );
}
helpSourceFileNew.setLastModified( helpSourceFile.lastModified() );
helpSourceFile.delete();
} }
Reader sourceReader = null;
PrintWriter sourceWriter = null;
try
{
sourceReader = new FileReader( helpSourceFile ); // FIXME platform encoding
sourceWriter = new PrintWriter( new FileWriter( helpSourceFileNew ) ); // FIXME platform encoding
sourceWriter.println( "package " + destinationPackage + ";" );
IOUtil.copy( sourceReader, sourceWriter );
}
catch ( IOException e )
{
throw new GeneratorException( e.getMessage(), e );
}
finally
{
IOUtil.close( sourceReader );
IOUtil.close( sourceWriter );
}
helpSourceFileNew.setLastModified( helpSourceFile.lastModified() );
helpSourceFile.delete();
// rewrite help mojo .class // rewrite help mojo .class
File rewriteHelpClassFile = File rewriteHelpClassFile =