Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

align used algorithm to detect java bin to use 

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
This commit is contained in:
olivier lamy 2018-10-24 14:30:13 +10:00
parent f4f3dc679a
commit 925afac48b
3 changed files with 53 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunDistro.java
View File

@ -500,7 +500,7 @@ public class JettyRunDistro extends JettyRunMojo
}
else
{
cmd.add( "java" );
cmd.add( getJavaBin() );
}
cmd.add("-jar");
cmd.add(new File(jettyHome, "start.jar").getAbsolutePath());

54
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java
View File

@ -44,6 +44,7 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.eclipse.jetty.annotations.AnnotationConfiguration;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
@ -151,7 +152,9 @@ public class JettyRunForkedMojo extends JettyRunMojo
* pom has an explicit dependency on it.
*/
private boolean hasSlf4jDeps;
@Parameter(property = "jetty.javaPath")
private String javaPath;
/**
* ShutdownThread
@ -271,7 +274,14 @@ public class JettyRunForkedMojo extends JettyRunMojo
tpool.stop();
List<String> cmd = new ArrayList<>();
cmd.add(getJavaBin());
if( StringUtil.isNotBlank( javaPath ))
{
cmd.add( javaPath );
}
else
{
cmd.add( getJavaBin() );
}
if (jvmArgs != null)
{
@ -307,7 +317,6 @@ public class JettyRunForkedMojo extends JettyRunMojo
cmd.add("--props");
cmd.add(props.getAbsolutePath());
String token = createToken();
Path tokenFile = target.toPath().resolve(createToken()+".txt");
cmd.add("--token");
cmd.add(tokenFile.toAbsolutePath().toString());
@ -508,46 +517,7 @@ public class JettyRunForkedMojo extends JettyRunMojo
return classPath.toString();
}
/**
* @return
*/
private String getJavaBin()
{
String javaexes[] = new String[]
{ "java", "java.exe" };
File javaHomeDir = new File(System.getProperty("java.home"));
for (String javaexe : javaexes)
{
File javabin = new File(javaHomeDir,fileSeparators("bin/" + javaexe));
if (javabin.exists() && javabin.isFile())
{
return javabin.getAbsolutePath();
}
}
return "java";
}
public static String fileSeparators(String path)
{
StringBuilder ret = new StringBuilder();
for (char c : path.toCharArray())
{
if ((c == '/') || (c == '\\'))
{
ret.append(File.separatorChar);
}
else
{
ret.append(c);
}
}
return ret.toString();
}
public static String pathSeparators(String path)
{

40
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java
View File

@ -738,4 +738,44 @@ public class JettyRunMojo extends AbstractJettyMojo
return null;
}
/**
* @return
*/
protected String getJavaBin()
{
String javaexes[] = new String[]
{ "java", "java.exe" };
File javaHomeDir = new File(System.getProperty("java.home"));
for (String javaexe : javaexes)
{
File javabin = new File(javaHomeDir,fileSeparators("bin/" + javaexe));
if (javabin.exists() && javabin.isFile())
{
return javabin.getAbsolutePath();
}
}
return "java";
}
public static String fileSeparators(String path)
{
StringBuilder ret = new StringBuilder();
for (char c : path.toCharArray())
{
if ((c == '/') || (c == '\\'))
{
ret.append(File.separatorChar);
}
else
{
ret.append(c);
}
}
return ret.toString();
}
}