Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR: MNG-1237 

Submitted by: Lester Ecarma
put -J options on the command line instead of in @options file

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327868 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-10-23 22:15:48 +00:00
parent a7698ef82d
commit f65248c28b
1 changed files with 1199 additions and 1198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
View File

@ -714,6 +714,48 @@ public class JavadocReport
Commandline cmd = new Commandline(); Commandline cmd = new Commandline();
if ( !StringUtils.isEmpty( maxmemory ) )
{
// Allow '128' or '128m'
if ( NumberUtils.isDigits( maxmemory ) )
{
cmd.createArgument().setValue( "-J-Xmx" + maxmemory + "m" );
}
else
{
if ( ( NumberUtils.isDigits( maxmemory.substring( 0, maxmemory.length() - 1 ) ) ) &&
( maxmemory.toLowerCase().endsWith( "m" ) ) )
{
cmd.createArgument().setValue( "-J-Xmx" + maxmemory );
}
else
{
getLog().error( "The maxmemory '" + maxmemory + "' is not a valid number. Ignore this option." );
}
}
}
if ( !StringUtils.isEmpty( minmemory ) )
{
// Allow '128' or '128m'
if ( NumberUtils.isDigits( minmemory ) )
{
cmd.createArgument().setValue( "-J-Xms" + minmemory + "m" );
}
else
{
if ( ( NumberUtils.isDigits( minmemory.substring( 0, minmemory.length() - 1 ) ) ) &&
( minmemory.toLowerCase().endsWith( "m" ) ) )
{
cmd.createArgument().setValue( "-J-Xms" + minmemory );
}
else
{
getLog().error( "The minmemory '" + minmemory + "' is not a valid number. Ignore this option." );
}
}
}
List arguments = new ArrayList(); List arguments = new ArrayList();
cmd.setWorkingDirectory( javadocDirectory.getAbsolutePath() ); cmd.setWorkingDirectory( javadocDirectory.getAbsolutePath() );
@ -730,47 +772,6 @@ public class JavadocReport
addArgIfNotEmpty( arguments, "-encoding", quotedArgument( encoding ) ); addArgIfNotEmpty( arguments, "-encoding", quotedArgument( encoding ) );
addArgIfNotEmpty( arguments, "-extdirs", quotedPathArgument( extdirs ) ); addArgIfNotEmpty( arguments, "-extdirs", quotedPathArgument( extdirs ) );
addArgIfNotEmpty( arguments, "-exclude", quotedArgument( excludePackageNames ), 1.4f ); addArgIfNotEmpty( arguments, "-exclude", quotedArgument( excludePackageNames ), 1.4f );
if ( !StringUtils.isEmpty( maxmemory ) )
{
// Allow '128' or '128m'
if ( NumberUtils.isDigits( maxmemory ) )
{
addArgIf( arguments, true, "-J-Xmx" + maxmemory + "m" );
}
else
{
if ( ( NumberUtils.isDigits( maxmemory.substring( 0, maxmemory.length() - 1 ) ) ) &&
( maxmemory.toLowerCase().endsWith( "m" ) ) )
{
addArgIf( arguments, true, "-J-Xmx" + maxmemory );
}
else
{
getLog().error( "The maxmemory '" + maxmemory + "' is not a valid number. Ignore this option." );
}
}
}
if ( !StringUtils.isEmpty( minmemory ) )
{
// Allow '128' or '128m'
if ( NumberUtils.isDigits( minmemory ) )
{
addArgIf( arguments, true, "-J-Xms" + minmemory + "m" );
}
else
{
if ( ( NumberUtils.isDigits( minmemory.substring( 0, minmemory.length() - 1 ) ) ) &&
( minmemory.toLowerCase().endsWith( "m" ) ) )
{
addArgIf( arguments, true, "-J-Xms" + minmemory );
}
else
{
getLog().error( "The minmemory '" + minmemory + "' is not a valid number. Ignore this option." );
}
}
}
if ( old && SystemUtils.isJavaVersionAtLeast( 1.4f ) ) if ( old && SystemUtils.isJavaVersionAtLeast( 1.4f ) )
{ {