Index: RunPlatformAppMojo.java =================================================================== --- RunPlatformAppMojo.java (revision 9181) +++ RunPlatformAppMojo.java (working copy) @@ -17,6 +17,8 @@ package org.codehaus.mojo.nbm; import java.io.File; +import java.util.List; +import java.util.ArrayList; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -102,17 +104,22 @@ try { - String[] args = new String[] - { - //TODO --jdkhome - "--userdir", - Commandline.quoteArgument( netbeansUserdir.getAbsolutePath() ), - "-J-Dnetbeans.logger.console=true", - "-J-ea", - "--branding", - brandingToken - }; - cmdLine.addArguments( args ); + + List args = new ArrayList(); + args.add("--userdir"); + args.add(Commandline.quoteArgument( netbeansUserdir.getAbsolutePath())); + args.add("-J-Dnetbeans.logger.console=true"); + args.add("-J-ea"); + args.add("--branding"); + args.add(brandingToken); + + // use JAVA_HOME if set + if (System.getenv("JAVA_HOME") != null) { + args.add("--jdkhome"); + args.add(System.getenv("JAVA_HOME")); + } + + cmdLine.addArguments( args.toArray(new String[0]) ); cmdLine.addArguments( Commandline.translateCommandline( additionalArguments ) ); getLog().info( "Executing: " + cmdLine.toString() );