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

Merge pull request #4336 from eclipse/jetty-9.4.x-2195-jvm-arg-expansion 

Fixes #2195 - Jetty start.jar can expand properties in JVM Args now
This commit is contained in:
Joakim Erdfelt 2019-11-27 05:47:12 -06:00 committed by GitHub
parent c440a3f972 5798471966
commit de3ff4726e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
View File

@ -705,7 +705,7 @@ public class StartArgs
}
else
{
cmd.addRawArg(x);
cmd.addRawArg(getProperties().expand(x));
}
}

32
jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
View File

@ -31,6 +31,7 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.startsWith;
@ -169,6 +170,37 @@ public class MainTest
ConfigurationAssert.assertConfiguration(baseHome, args, "assert-home-with-jvm.txt");
}
@Test
public void testJvmArgExpansion() throws Exception
{
List<String> cmdLineArgs = new ArrayList<>();
Path homePath = MavenTestingUtils.getTestResourceDir("dist-home").toPath().toRealPath();
cmdLineArgs.add("jetty.home=" + homePath.toString());
cmdLineArgs.add("user.dir=" + homePath.toString());
// JVM args
cmdLineArgs.add("--exec");
cmdLineArgs.add("-Xms1g");
cmdLineArgs.add("-Xmx4g");
cmdLineArgs.add("-Xloggc:${jetty.base}/logs/gc-${java.version}.log");
Main main = new Main();
StartArgs args = main.processCommandLine(cmdLineArgs.toArray(new String[cmdLineArgs.size()]));
BaseHome baseHome = main.getBaseHome();
assertThat("jetty.home", baseHome.getHome(), is(homePath.toString()));
assertThat("jetty.base", baseHome.getBase(), is(homePath.toString()));
CommandLineBuilder commandLineBuilder = args.getMainArgs(true);
String commandLine = commandLineBuilder.toString("\n");
String expectedExpansion = String.format("-Xloggc:%s/logs/gc-%s.log",
baseHome.getBase(), System.getProperty("java.version")
);
assertThat(commandLine, containsString(expectedExpansion));
}
@Test
public void testWithModules() throws Exception
{