Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Bordet2015-04-13 14:21:48 +0000
committerSimone Bordet2015-04-13 14:21:48 +0000
commit599ab9bb1bee454f190d964b67859e46a1e57f87 (patch)
treeb729472f7fc361ec6b84526c74cf193c383e77b7 /jetty-start
parentd78673f8f824d562bf181fe2aaf929bad6f6e695 (diff)
downloadorg.eclipse.jetty.project-599ab9bb1bee454f190d964b67859e46a1e57f87.tar.gz
org.eclipse.jetty.project-599ab9bb1bee454f190d964b67859e46a1e57f87.tar.xz
org.eclipse.jetty.project-599ab9bb1bee454f190d964b67859e46a1e57f87.zip
460671 - Rationalize property names.
Property format is now "jetty.<module|component>.<propertyName>". Updated all references with new properties.
Diffstat (limited to 'jetty-start')
-rw-r--r--jetty-start/src/test/java/org/eclipse/jetty/start/IncludeJettyDirTest.java110
-rw-r--r--jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java12
-rw-r--r--jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java10
-rw-r--r--jetty-start/src/test/java/org/eclipse/jetty/start/config/ConfigSourcesTest.java102
-rw-r--r--jetty-start/src/test/resources/assert-home-with-http2.txt45
-rw-r--r--jetty-start/src/test/resources/assert-home-with-jvm.txt27
-rw-r--r--jetty-start/src/test/resources/assert-home.txt25
-rw-r--r--jetty-start/src/test/resources/dist-home/etc/jetty-debuglog.xml (renamed from jetty-start/src/test/resources/dist-home/etc/jetty-debug.xml)0
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn.mod14
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/debug.mod12
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/debuglog.mod25
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/deploy.mod10
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/fcgi.mod2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/gzip.mod15
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/http.mod31
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/http2.mod6
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/http2c.mod14
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/jaas.mod5
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/jmx-remote.mod12
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/logging.mod17
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/lowresources.mod24
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/proxy.mod12
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/requestlog.mod32
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/rewrite.mod10
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/server.mod77
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/ssl.mod80
-rw-r--r--jetty-start/src/test/resources/dist-home/start.ini40
-rw-r--r--jetty-start/src/test/resources/usecases/agent-properties.assert.txt26
-rw-r--r--jetty-start/src/test/resources/usecases/agent-properties/start.ini2
-rw-r--r--jetty-start/src/test/resources/usecases/assert-enable-spdy-bad-npn-version.txt12
-rw-r--r--jetty-start/src/test/resources/usecases/assert-with-module-persistence.txt12
-rw-r--r--jetty-start/src/test/resources/usecases/barebones.assert.txt26
-rw-r--r--jetty-start/src/test/resources/usecases/barebones/start.ini2
-rw-r--r--jetty-start/src/test/resources/usecases/basic-properties.assert.txt26
-rw-r--r--jetty-start/src/test/resources/usecases/basic-properties/start.ini2
-rw-r--r--jetty-start/src/test/resources/usecases/database.assert.txt26
-rw-r--r--jetty-start/src/test/resources/usecases/database/start.ini2
-rw-r--r--jetty-start/src/test/resources/usecases/deep-ext.assert.txt26
-rw-r--r--jetty-start/src/test/resources/usecases/deep-ext/start.ini2
-rw-r--r--jetty-start/src/test/resources/usecases/http2.assert.txt45
-rw-r--r--jetty-start/src/test/resources/usecases/http2/start.ini12
-rw-r--r--jetty-start/src/test/resources/usecases/include-jetty-dir-logging.assert.txt26
-rw-r--r--jetty-start/src/test/resources/usecases/include-jetty-dir-logging/start.ini2
-rw-r--r--jetty-start/src/test/resources/usecases/jmx.assert.txt26
-rw-r--r--jetty-start/src/test/resources/usecases/jmx/start.ini2
-rw-r--r--jetty-start/src/test/resources/usecases/jsp.assert.txt26
-rw-r--r--jetty-start/src/test/resources/usecases/jsp/start.ini2
-rw-r--r--jetty-start/src/test/resources/usecases/logging.assert.txt27
-rw-r--r--jetty-start/src/test/resources/usecases/logging/start.ini2
49 files changed, 602 insertions, 501 deletions
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/IncludeJettyDirTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/IncludeJettyDirTest.java
index ba19edf1ea..3c353dfd6e 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/IncludeJettyDirTest.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/IncludeJettyDirTest.java
@@ -18,10 +18,6 @@
package org.eclipse.jetty.start;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -36,6 +32,10 @@ import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+
public class IncludeJettyDirTest
{
private static class MainResult
@@ -97,7 +97,7 @@ public class IncludeJettyDirTest
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1");
+ "jetty.http.host=127.0.0.1");
// Simple command line - no reference to include-jetty-dirs
MainResult result = runMain(base,home);
@@ -107,7 +107,7 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder);
- result.assertProperty("jetty.host","127.0.0.1");
+ result.assertProperty("jetty.http.host","127.0.0.1");
}
@Test
@@ -121,13 +121,13 @@ public class IncludeJettyDirTest
// Create common
File common = testdir.getFile("common");
FS.ensureEmpty(common);
- TestEnv.makeFile(common,"start.ini","jetty.port=8080");
+ TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1");
+ "jetty.http.host=127.0.0.1");
// Simple command line reference to include-jetty-dir
MainResult result = runMain(base,home,
@@ -140,8 +140,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder);
- result.assertProperty("jetty.host","127.0.0.1");
- result.assertProperty("jetty.port","8080"); // from 'common'
+ result.assertProperty("jetty.http.host","127.0.0.1");
+ result.assertProperty("jetty.http.port","8080"); // from 'common'
}
@Test
@@ -155,13 +155,13 @@ public class IncludeJettyDirTest
// Create common
File common = testdir.getFile("common");
FS.ensureEmpty(common);
- TestEnv.makeFile(common,"start.ini","jetty.port=8080");
+ TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1");
+ "jetty.http.host=127.0.0.1");
// Simple command line reference to include-jetty-dir via property (also on command line)
MainResult result = runMain(base,home,
@@ -176,8 +176,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder);
- result.assertProperty("jetty.host","127.0.0.1");
- result.assertProperty("jetty.port","8080"); // from 'common'
+ result.assertProperty("jetty.http.host","127.0.0.1");
+ result.assertProperty("jetty.http.port","8080"); // from 'common'
}
@Test
@@ -195,13 +195,13 @@ public class IncludeJettyDirTest
// Create common
File common = new File(opt,"common");
FS.ensureEmpty(common);
- TestEnv.makeFile(common,"start.ini","jetty.port=8080");
+ TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1");
+ "jetty.http.host=127.0.0.1");
String dirRef = "${my.opt}" + File.separator + "common";
@@ -218,8 +218,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder);
- result.assertProperty("jetty.host","127.0.0.1");
- result.assertProperty("jetty.port","8080"); // from 'common'
+ result.assertProperty("jetty.http.host","127.0.0.1");
+ result.assertProperty("jetty.http.port","8080"); // from 'common'
}
@Test
@@ -237,13 +237,13 @@ public class IncludeJettyDirTest
// Create common
File common = new File(opt,"common");
FS.ensureEmpty(common);
- TestEnv.makeFile(common,"start.ini","jetty.port=8080");
+ TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1");
+ "jetty.http.host=127.0.0.1");
String dirRef = "${my.opt}" + File.separator + "${my.dir}";
@@ -262,8 +262,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder);
- result.assertProperty("jetty.host","127.0.0.1");
- result.assertProperty("jetty.port","8080"); // from 'common'
+ result.assertProperty("jetty.http.host","127.0.0.1");
+ result.assertProperty("jetty.http.port","8080"); // from 'common'
}
@Test
@@ -277,13 +277,13 @@ public class IncludeJettyDirTest
// Create common
File common = testdir.getFile("common");
FS.ensureEmpty(common);
- TestEnv.makeFile(common,"start.ini","jetty.port=8080");
+ TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1",//
+ "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath());
MainResult result = runMain(base,home);
@@ -294,8 +294,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder);
- result.assertProperty("jetty.host","127.0.0.1");
- result.assertProperty("jetty.port","8080"); // from 'common'
+ result.assertProperty("jetty.http.host","127.0.0.1");
+ result.assertProperty("jetty.http.port","8080"); // from 'common'
}
@Test
@@ -309,7 +309,7 @@ public class IncludeJettyDirTest
// Create common
File common = testdir.getFile("common");
FS.ensureEmpty(common);
- TestEnv.makeFile(common,"start.ini","jetty.port=8080");
+ TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create corp
File corp = testdir.getFile("corp");
@@ -319,7 +319,7 @@ public class IncludeJettyDirTest
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1",//
+ "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath(), //
"--include-jetty-dir=" + corp.getAbsolutePath());
@@ -332,8 +332,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder);
- result.assertProperty("jetty.host","127.0.0.1");
- result.assertProperty("jetty.port","8080"); // from 'common'
+ result.assertProperty("jetty.http.host","127.0.0.1");
+ result.assertProperty("jetty.http.port","8080"); // from 'common'
}
@Test
@@ -347,20 +347,20 @@ public class IncludeJettyDirTest
// Create corp
File corp = testdir.getFile("corp");
FS.ensureEmpty(corp);
- TestEnv.makeFile(corp,"start.ini","jetty.port=9090");
+ TestEnv.makeFile(corp,"start.ini","jetty.http.port=9090");
// Create common
File common = testdir.getFile("common");
FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", //
"--include-jetty-dir=" + corp.getAbsolutePath(), //
- "jetty.port=8080");
+ "jetty.http.port=8080");
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1",//
+ "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath());
MainResult result = runMain(base,home);
@@ -372,8 +372,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder);
- result.assertProperty("jetty.host","127.0.0.1");
- result.assertProperty("jetty.port","8080"); // from 'common'
+ result.assertProperty("jetty.http.host","127.0.0.1");
+ result.assertProperty("jetty.http.port","8080"); // from 'common'
}
@Test
@@ -388,7 +388,7 @@ public class IncludeJettyDirTest
File corp = testdir.getFile("corp");
FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini", //
- "jetty.port=9090");
+ "jetty.http.port=9090");
// Create common
File common = testdir.getFile("common");
@@ -396,13 +396,13 @@ public class IncludeJettyDirTest
TestEnv.makeFile(common,"start.ini", //
"my.corp=" + corp.getAbsolutePath(), //
"--include-jetty-dir=${my.corp}", //
- "jetty.port=8080");
+ "jetty.http.port=8080");
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1",//
+ "jetty.http.host=127.0.0.1",//
"my.common=" + common.getAbsolutePath(), //
"--include-jetty-dir=${my.common}");
@@ -415,8 +415,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder);
- result.assertProperty("jetty.host","127.0.0.1");
- result.assertProperty("jetty.port","8080"); // from 'common'
+ result.assertProperty("jetty.http.host","127.0.0.1");
+ result.assertProperty("jetty.http.port","8080"); // from 'common'
}
@Test
@@ -432,26 +432,26 @@ public class IncludeJettyDirTest
FS.ensureEmpty(devops);
TestEnv.makeFile(devops,"start.ini", //
"--module=logging", //
- "jetty.port=2222");
+ "jetty.http.port=2222");
// Create corp
File corp = testdir.getFile("corp");
FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini", //
- "jetty.port=9090");
+ "jetty.http.port=9090");
// Create common
File common = testdir.getFile("common");
FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", //
"--include-jetty-dir=" + corp.getAbsolutePath(), //
- "jetty.port=8080");
+ "jetty.http.port=8080");
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1",//
+ "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath());
MainResult result = runMain(base,home,
@@ -466,8 +466,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder);
- result.assertProperty("jetty.host","127.0.0.1");
- result.assertProperty("jetty.port","2222"); // from 'devops'
+ result.assertProperty("jetty.http.host","127.0.0.1");
+ result.assertProperty("jetty.http.port","2222"); // from 'devops'
}
@Test
@@ -482,25 +482,25 @@ public class IncludeJettyDirTest
File corp = testdir.getFile("corp");
FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini", //
- "jetty.port=9090");
+ "jetty.http.port=9090");
// Create common
File common = testdir.getFile("common");
FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", //
"--include-jetty-dir=" + corp.getAbsolutePath(), //
- "jetty.port=8080");
+ "jetty.http.port=8080");
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1",//
+ "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath());
MainResult result = runMain(base,home,
// command line property should override all others
- "jetty.port=7070");
+ "jetty.http.port=7070");
List<String> expectedSearchOrder = new ArrayList<>();
expectedSearchOrder.add("${jetty.base}");
@@ -509,8 +509,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder);
- result.assertProperty("jetty.host","127.0.0.1");
- result.assertProperty("jetty.port","7070"); // from command line
+ result.assertProperty("jetty.http.host","127.0.0.1");
+ result.assertProperty("jetty.http.port","7070"); // from command line
}
@Test
@@ -530,14 +530,14 @@ public class IncludeJettyDirTest
FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini",
// standard property
- "jetty.port=9090",
+ "jetty.http.port=9090",
// INTENTIONAL BAD Reference (duplicate)
"--include-jetty-dir=" + common.getAbsolutePath());
// Populate common
TestEnv.makeFile(common,"start.ini",
// standard property
- "jetty.port=8080",
+ "jetty.http.port=8080",
// reference to corp
"--include-jetty-dir=" + corp.getAbsolutePath());
@@ -545,7 +545,7 @@ public class IncludeJettyDirTest
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1",//
+ "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath());
try
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
index ca61c3d8e2..5a71fdf7dc 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
@@ -18,10 +18,6 @@
package org.eclipse.jetty.start;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -35,6 +31,10 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
public class MainTest
{
@Rule
@@ -54,7 +54,7 @@ public class MainTest
File testJettyHome = MavenTestingUtils.getTestResourceDir("dist-home").getAbsoluteFile();
cmdLineArgs.add("user.dir=" + testJettyHome);
cmdLineArgs.add("jetty.home=" + testJettyHome);
- cmdLineArgs.add("jetty.port=9090");
+ cmdLineArgs.add("jetty.http.port=9090");
Main main = new Main();
StartArgs args = main.processCommandLine(cmdLineArgs.toArray(new String[cmdLineArgs.size()]));
@@ -90,7 +90,7 @@ public class MainTest
List<String> cmdLineArgs = new ArrayList<>();
File testJettyHome = MavenTestingUtils.getTestResourceDir("dist-home");
cmdLineArgs.add("jetty.home=" + testJettyHome);
- cmdLineArgs.add("jetty.port=9090");
+ cmdLineArgs.add("jetty.http.port=9090");
cmdLineArgs.add("--list-config");
// cmdLineArgs.add("--debug");
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java
index b4fbb83b2c..b902dbdbf4 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java
@@ -18,10 +18,6 @@
package org.eclipse.jetty.start;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -41,6 +37,10 @@ import org.eclipse.jetty.toolchain.test.TestingDir;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
public class ModulesTest
{
private final static String TEST_SOURCE = "<test>";
@@ -92,7 +92,7 @@ public class ModulesTest
expected.add("cdi");
expected.add("client");
expected.add("continuation");
- expected.add("debug");
+ expected.add("debuglog");
expected.add("deploy");
expected.add("ext");
expected.add("fcgi");
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/config/ConfigSourcesTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/config/ConfigSourcesTest.java
index 1388f7e56d..84c205ca96 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/config/ConfigSourcesTest.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/config/ConfigSourcesTest.java
@@ -18,10 +18,6 @@
package org.eclipse.jetty.start.config;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -38,6 +34,10 @@ import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+
public class ConfigSourcesTest
{
@Rule
@@ -91,7 +91,7 @@ public class ConfigSourcesTest
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1");
+ "jetty.http.host=127.0.0.1");
ConfigSources sources = new ConfigSources();
@@ -119,7 +119,7 @@ public class ConfigSourcesTest
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1",//
+ "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources();
@@ -143,13 +143,13 @@ public class ConfigSourcesTest
// Create common
File common = testdir.getFile("common");
FS.ensureEmpty(common);
- TestEnv.makeFile(common,"start.ini","jetty.port=8080");
+ TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1");
+ "jetty.http.host=127.0.0.1");
ConfigSources sources = new ConfigSources();
@@ -169,8 +169,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,common,home);
- assertProperty(sources,"jetty.host","127.0.0.1");
- assertProperty(sources,"jetty.port","8080"); // from 'common'
+ assertProperty(sources,"jetty.http.host","127.0.0.1");
+ assertProperty(sources,"jetty.http.port","8080"); // from 'common'
}
@Test
@@ -188,13 +188,13 @@ public class ConfigSourcesTest
// Create common
File common = new File(opt,"common");
FS.ensureEmpty(common);
- TestEnv.makeFile(common,"start.ini","jetty.port=8080");
+ TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1");
+ "jetty.http.host=127.0.0.1");
String dirRef = "${my.opt}" + File.separator + "common";
@@ -215,8 +215,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,common,home);
- assertProperty(sources,"jetty.host","127.0.0.1");
- assertProperty(sources,"jetty.port","8080"); // from 'common'
+ assertProperty(sources,"jetty.http.host","127.0.0.1");
+ assertProperty(sources,"jetty.http.port","8080"); // from 'common'
}
@Test
@@ -234,13 +234,13 @@ public class ConfigSourcesTest
// Create common
File common = new File(opt,"common");
FS.ensureEmpty(common);
- TestEnv.makeFile(common,"start.ini","jetty.port=8080");
+ TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1");
+ "jetty.http.host=127.0.0.1");
String dirRef = "${my.opt}" + File.separator + "${my.dir}";
@@ -264,8 +264,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,common,home);
- assertProperty(sources,"jetty.host","127.0.0.1");
- assertProperty(sources,"jetty.port","8080"); // from 'common'
+ assertProperty(sources,"jetty.http.host","127.0.0.1");
+ assertProperty(sources,"jetty.http.port","8080"); // from 'common'
}
@Test
@@ -279,13 +279,13 @@ public class ConfigSourcesTest
// Create common
File common = testdir.getFile("common");
FS.ensureEmpty(common);
- TestEnv.makeFile(common,"start.ini","jetty.port=8080");
+ TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1",//
+ "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources();
@@ -299,8 +299,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,common,home);
- assertProperty(sources,"jetty.host","127.0.0.1");
- assertProperty(sources,"jetty.port","8080"); // from 'common'
+ assertProperty(sources,"jetty.http.host","127.0.0.1");
+ assertProperty(sources,"jetty.http.port","8080"); // from 'common'
}
@Test
@@ -314,7 +314,7 @@ public class ConfigSourcesTest
// Create common
File common = testdir.getFile("common");
FS.ensureEmpty(common);
- TestEnv.makeFile(common,"start.ini","jetty.port=8080");
+ TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create corp
File corp = testdir.getFile("corp");
@@ -324,7 +324,7 @@ public class ConfigSourcesTest
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1",//
+ "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath(), //
"--include-jetty-dir=" + corp.getAbsolutePath());
@@ -342,8 +342,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,common,corp,home);
- assertProperty(sources,"jetty.host","127.0.0.1");
- assertProperty(sources,"jetty.port","8080"); // from 'common'
+ assertProperty(sources,"jetty.http.host","127.0.0.1");
+ assertProperty(sources,"jetty.http.port","8080"); // from 'common'
}
@Test
@@ -358,20 +358,20 @@ public class ConfigSourcesTest
File corp = testdir.getFile("corp");
FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini", //
- "jetty.port=9090");
+ "jetty.http.port=9090");
// Create common
File common = testdir.getFile("common");
FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", //
"--include-jetty-dir=" + corp.getAbsolutePath(), //
- "jetty.port=8080");
+ "jetty.http.port=8080");
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1",//
+ "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources();
@@ -388,8 +388,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,common,corp,home);
- assertProperty(sources,"jetty.host","127.0.0.1");
- assertProperty(sources,"jetty.port","8080"); // from 'common'
+ assertProperty(sources,"jetty.http.host","127.0.0.1");
+ assertProperty(sources,"jetty.http.port","8080"); // from 'common'
}
@Test
@@ -404,7 +404,7 @@ public class ConfigSourcesTest
File corp = testdir.getFile("corp");
FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini", //
- "jetty.port=9090");
+ "jetty.http.port=9090");
// Create common
File common = testdir.getFile("common");
@@ -412,13 +412,13 @@ public class ConfigSourcesTest
TestEnv.makeFile(common,"start.ini", //
"my.corp=" + corp.getAbsolutePath(), //
"--include-jetty-dir=${my.corp}", //
- "jetty.port=8080");
+ "jetty.http.port=8080");
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1",//
+ "jetty.http.host=127.0.0.1",//
"my.common="+common.getAbsolutePath(), //
"--include-jetty-dir=${my.common}");
@@ -437,8 +437,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,common,corp,home);
- assertProperty(sources,"jetty.host","127.0.0.1");
- assertProperty(sources,"jetty.port","8080"); // from 'common'
+ assertProperty(sources,"jetty.http.host","127.0.0.1");
+ assertProperty(sources,"jetty.http.port","8080"); // from 'common'
}
@Test
@@ -454,26 +454,26 @@ public class ConfigSourcesTest
FS.ensureEmpty(devops);
TestEnv.makeFile(devops,"start.ini", //
"--module=logging", //
- "jetty.port=2222");
+ "jetty.http.port=2222");
// Create corp
File corp = testdir.getFile("corp");
FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini", //
- "jetty.port=9090");
+ "jetty.http.port=9090");
// Create common
File common = testdir.getFile("common");
FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", //
"--include-jetty-dir=" + corp.getAbsolutePath(), //
- "jetty.port=8080");
+ "jetty.http.port=8080");
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1",//
+ "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources();
@@ -494,8 +494,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,devops,common,corp,home);
- assertProperty(sources,"jetty.host","127.0.0.1");
- assertProperty(sources,"jetty.port","2222"); // from 'common'
+ assertProperty(sources,"jetty.http.host","127.0.0.1");
+ assertProperty(sources,"jetty.http.port","2222"); // from 'common'
}
@Test
@@ -510,27 +510,27 @@ public class ConfigSourcesTest
File corp = testdir.getFile("corp");
FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini", //
- "jetty.port=9090");
+ "jetty.http.port=9090");
// Create common
File common = testdir.getFile("common");
FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", //
"--include-jetty-dir=" + corp.getAbsolutePath(), //
- "jetty.port=8080");
+ "jetty.http.port=8080");
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1",//
+ "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources();
String cmdLine[] = new String[]{
// command line property should override all others
- "jetty.port=7070"
+ "jetty.http.port=7070"
};
sources.add(new CommandLineConfigSource(cmdLine));
sources.add(new JettyHomeConfigSource(home.toPath()));
@@ -543,8 +543,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,common,corp,home);
- assertProperty(sources,"jetty.host","127.0.0.1");
- assertProperty(sources,"jetty.port","7070"); // from <command-line>
+ assertProperty(sources,"jetty.http.host","127.0.0.1");
+ assertProperty(sources,"jetty.http.port","7070"); // from <command-line>
}
@Test
@@ -564,14 +564,14 @@ public class ConfigSourcesTest
FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini",
// standard property
- "jetty.port=9090",
+ "jetty.http.port=9090",
// INTENTIONAL BAD Reference (duplicate)
"--include-jetty-dir=" + common.getAbsolutePath());
// Populate common
TestEnv.makeFile(common,"start.ini",
// standard property
- "jetty.port=8080",
+ "jetty.http.port=8080",
// reference to corp
"--include-jetty-dir=" + corp.getAbsolutePath());
@@ -579,7 +579,7 @@ public class ConfigSourcesTest
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
- "jetty.host=127.0.0.1",//
+ "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources();
diff --git a/jetty-start/src/test/resources/assert-home-with-http2.txt b/jetty-start/src/test/resources/assert-home-with-http2.txt
index b852b13650..527e91f8d3 100644
--- a/jetty-start/src/test/resources/assert-home-with-http2.txt
+++ b/jetty-start/src/test/resources/assert-home-with-http2.txt
@@ -51,29 +51,28 @@ LIB|${jetty.base}/lib/servlet-api-3.1.jar
# The Properties we expect (order is irrelevant)
# (these are the properties we actually set in the configuration)
PROP|java.version=1.7.0_60
-PROP|jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g
-PROP|jetty.keystore=etc/keystore
-PROP|jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
-PROP|jetty.secure.port=8443
-PROP|jetty.truststore=etc/keystore
-PROP|jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
-PROP|ssl.port=8443
-PROP|ssl.timeout=30000
+# PROP|jetty.sslConfig.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g
+# PROP|jetty.sslConfig.keystorePath=etc/keystore
+# PROP|jetty.sslConfig.keystorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
+# PROP|jetty.httpConfig.securePort=8443
+# PROP|jetty.sslConfig.truststorePath=etc/keystore
+# PROP|jetty.sslConfig.truststorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
+# PROP|jetty.ssl.port=8443
+# PROP|jetty.ssl.idleTimeout=30000
# (these are the ones set by default from jetty.home modules)
-PROP|jetty.port=8080
-PROP|http.timeout=30000
-PROP|jetty.delayDispatchUntilContent=false
-PROP|jetty.dump.start=false
-PROP|jetty.dump.stop=false
-PROP|jetty.output.buffer.size=32768
-PROP|jetty.request.header.size=8192
-PROP|jetty.response.header.size=8192
-PROP|jetty.send.date.header=false
-PROP|jetty.send.server.version=true
-PROP|threads.max=200
-PROP|threads.min=10
-PROP|threads.timeout=60000
-
+PROP|jetty.alpn.debug=false
+PROP|jetty.http.port=8080
+PROP|jetty.httpConfig.delayDispatchUntilContent=false
+PROP|jetty.server.dumpAfterStart=false
+PROP|jetty.server.dumpBeforeStop=false
+PROP|jetty.httpConfig.outputBufferSize=32768
+PROP|jetty.httpConfig.requestHeaderSize=8192
+PROP|jetty.httpConfig.responseHeaderSize=8192
+PROP|jetty.httpConfig.sendDateHeader=false
+PROP|jetty.httpConfig.sendServerVersion=true
+PROP|jetty.threadPool.maxThreads=200
+PROP|jetty.threadPool.minThreads=10
+PROP|jetty.threadPool.idleTimeout=60000
# JVM Args
JVM|-Xms1024m
@@ -89,5 +88,3 @@ FILE|lib/ext/
FILE|lib/alpn/
FILE|resources/
FILE|webapps/
-
-
diff --git a/jetty-start/src/test/resources/assert-home-with-jvm.txt b/jetty-start/src/test/resources/assert-home-with-jvm.txt
index c8b69bd4c6..771f6da1be 100644
--- a/jetty-start/src/test/resources/assert-home-with-jvm.txt
+++ b/jetty-start/src/test/resources/assert-home-with-jvm.txt
@@ -47,21 +47,20 @@ LIB|${jetty.base}/lib/websocket/websocket-servlet-TEST.jar
# The Properties we expect (order is irrelevant)
# (these are the properties we actually set in the configuration)
-# PROP|jetty.port=8080
+# PROP|jetty.http.port=8080
# (these are the ones set by default from jetty.home modules)
-PROP|jetty.port=8080
-PROP|http.timeout=30000
-PROP|jetty.delayDispatchUntilContent=false
-PROP|jetty.dump.start=false
-PROP|jetty.dump.stop=false
-PROP|jetty.output.buffer.size=32768
-PROP|jetty.request.header.size=8192
-PROP|jetty.response.header.size=8192
-PROP|jetty.send.date.header=false
-PROP|jetty.send.server.version=true
-PROP|threads.max=200
-PROP|threads.min=10
-PROP|threads.timeout=60000
+PROP|jetty.http.port=8080
+PROP|jetty.httpConfig.delayDispatchUntilContent=false
+PROP|jetty.server.dumpAfterStart=false
+PROP|jetty.server.dumpBeforeStop=false
+PROP|jetty.httpConfig.outputBufferSize=32768
+PROP|jetty.httpConfig.requestHeaderSize=8192
+PROP|jetty.httpConfig.responseHeaderSize=8192
+PROP|jetty.httpConfig.sendDateHeader=false
+PROP|jetty.httpConfig.sendServerVersion=true
+PROP|jetty.threadPool.maxThreads=200
+PROP|jetty.threadPool.minThreads=10
+PROP|jetty.threadPool.idleTimeout=60000
# JVM Args
JVM|-Xms1024m
diff --git a/jetty-start/src/test/resources/assert-home.txt b/jetty-start/src/test/resources/assert-home.txt
index 3abc8000e0..aab1bae2e9 100644
--- a/jetty-start/src/test/resources/assert-home.txt
+++ b/jetty-start/src/test/resources/assert-home.txt
@@ -43,20 +43,19 @@ LIB|${jetty.base}/lib/websocket/websocket-servlet-TEST.jar
# The Properties we expect (order is irrelevant)
# (these are the properties we actually set in the configuration)
-PROP|jetty.port=9090
+PROP|jetty.http.port=9090
# (these are the ones set by default from jetty.home modules)
-PROP|http.timeout=30000
-PROP|jetty.delayDispatchUntilContent=false
-PROP|jetty.dump.start=false
-PROP|jetty.dump.stop=false
-PROP|jetty.output.buffer.size=32768
-PROP|jetty.request.header.size=8192
-PROP|jetty.response.header.size=8192
-PROP|jetty.send.date.header=false
-PROP|jetty.send.server.version=true
-PROP|threads.max=200
-PROP|threads.min=10
-PROP|threads.timeout=60000
+PROP|jetty.httpConfig.delayDispatchUntilContent=false
+PROP|jetty.server.dumpAfterStart=false
+PROP|jetty.server.dumpBeforeStop=false
+PROP|jetty.httpConfig.outputBufferSize=32768
+PROP|jetty.httpConfig.requestHeaderSize=8192
+PROP|jetty.httpConfig.responseHeaderSize=8192
+PROP|jetty.httpConfig.sendDateHeader=false
+PROP|jetty.httpConfig.sendServerVersion=true
+PROP|jetty.threadPool.maxThreads=200
+PROP|jetty.threadPool.minThreads=10
+PROP|jetty.threadPool.idleTimeout=60000
# Files
FILE|lib/
diff --git a/jetty-start/src/test/resources/dist-home/etc/jetty-debug.xml b/jetty-start/src/test/resources/dist-home/etc/jetty-debuglog.xml
index e69de29bb2..e69de29bb2 100644
--- a/jetty-start/src/test/resources/dist-home/etc/jetty-debug.xml
+++ b/jetty-start/src/test/resources/dist-home/etc/jetty-debuglog.xml
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn.mod b/jetty-start/src/test/resources/dist-home/modules/alpn.mod
index 2a6a1785ec..41a6f295d3 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn.mod
@@ -35,13 +35,19 @@ lib/
lib/alpn/
[ini-template]
-# Configuration for ALPN
-# alpn.protocols=h2-14,http/1.1
-# alpn.defaultProtocol=http/1.1
+# Overrides the order protocols are chosen by the server.
+# The default order is that specified by the order of the
+# modules declared in start.ini.
+# jetty.alpn.protocols=h2-16,http/1.1
+
+# Specifies what protocol to use when negotiation fails.
+# jetty.alpn.defaultProtocol=http/1.1
+
+# ALPN debug logging on System.err
+jetty.alpn.debug=false
[license]
ALPN is a hosted at github under the GPL v2 with ClassPath Exception.
ALPN replaces/modifies OpenJDK classes in the java.sun.security.ssl package.
http://github.com/jetty-project/jetty-alpn
http://openjdk.java.net/legal/gplv2+ce.html
-
diff --git a/jetty-start/src/test/resources/dist-home/modules/debug.mod b/jetty-start/src/test/resources/dist-home/modules/debug.mod
deleted file mode 100644
index 5acce7aa90..0000000000
--- a/jetty-start/src/test/resources/dist-home/modules/debug.mod
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Debug module
-#
-
-[depend]
-server
-
-[files]
-logs/
-
-[xml]
-etc/jetty-debug.xml
diff --git a/jetty-start/src/test/resources/dist-home/modules/debuglog.mod b/jetty-start/src/test/resources/dist-home/modules/debuglog.mod
new file mode 100644
index 0000000000..20bfa6ab38
--- /dev/null
+++ b/jetty-start/src/test/resources/dist-home/modules/debuglog.mod
@@ -0,0 +1,25 @@
+#
+# Debug module
+#
+
+[depend]
+server
+
+[files]
+logs/
+
+[xml]
+etc/jetty-debug.xml
+
+[ini-template]
+## Logging directory (relative to $jetty.base)
+# jetty.debuglog.dir=logs
+
+## Whether to append to existing file
+# jetty.debuglog.append=false
+
+## How many days to retain old log files
+# jetty.debuglog.retainDays=90
+
+## Timezone of the log entries
+# jetty.debuglog.timezone=GMT
diff --git a/jetty-start/src/test/resources/dist-home/modules/deploy.mod b/jetty-start/src/test/resources/dist-home/modules/deploy.mod
index f16b3f2fff..3a2fc916d0 100644
--- a/jetty-start/src/test/resources/dist-home/modules/deploy.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/deploy.mod
@@ -15,7 +15,11 @@ webapps/
etc/jetty-deploy.xml
[ini-template]
-## DeployManager configuration
-# Monitored Directory name (relative to jetty.base)
-# jetty.deploy.monitoredDirName=webapps
+# Monitored directory name (relative to jetty.base)
+# jetty.deploy.monitoredDir=webapps
+# Monitored directory scan period (seconds)
+# jetty.deploy.scanInterval=1
+
+# Whether to extract *.war files
+# jetty.deploy.extractWars=true
diff --git a/jetty-start/src/test/resources/dist-home/modules/fcgi.mod b/jetty-start/src/test/resources/dist-home/modules/fcgi.mod
index e837b009c1..14152d5f2b 100644
--- a/jetty-start/src/test/resources/dist-home/modules/fcgi.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/fcgi.mod
@@ -12,4 +12,4 @@ lib/fcgi/*.jar
[ini-template]
## For configuration of FastCGI contexts, see
-## TODO: documentation url here
+## https://www.eclipse.org/jetty/documentation/current/fastcgi.html
diff --git a/jetty-start/src/test/resources/dist-home/modules/gzip.mod b/jetty-start/src/test/resources/dist-home/modules/gzip.mod
index c098092974..1efc834648 100644
--- a/jetty-start/src/test/resources/dist-home/modules/gzip.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/gzip.mod
@@ -10,9 +10,14 @@ server
etc/jetty-gzip.xml
[ini-template]
-### Gzip Handler
+## Minimum content length after which gzip is enabled
+# jetty.gzip.minGzipSize=2048
-gzip.minGzipSize=2048
-gzip.checkGzExists=false
-gzip.compressionLevel=-1
-gzip.excludedUserAgent=.*MSIE.6\.0.*
+## Check whether a file with *.gz extension exists
+# jetty.gzip.checkGzExists=false
+
+## Gzip compression level (-1 for default)
+# jetty.gzip.compressionLevel=-1
+
+## User agents for which gzip is disabled
+# jetty.gzip.excludedUserAgent=.*MSIE.6\.0.*
diff --git a/jetty-start/src/test/resources/dist-home/modules/http.mod b/jetty-start/src/test/resources/dist-home/modules/http.mod
index dc34bc3cb9..0957a796c5 100644
--- a/jetty-start/src/test/resources/dist-home/modules/http.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/http.mod
@@ -11,17 +11,26 @@ etc/jetty-http.xml
[ini-template]
### HTTP Connector Configuration
-## HTTP port to listen on
-jetty.port=8080
+## Connector host/address to bind to
+# jetty.http.host=0.0.0.0
-## HTTP idle timeout in milliseconds
-http.timeout=30000
+## Connector port to listen on
+# jetty.http.port=80
-## HTTP Socket.soLingerTime in seconds. (-1 to disable)
-# http.soLingerTime=-1
+## Connector idle timeout in milliseconds
+# jetty.http.idleTimeout=30000
-## Parameters to control the number and priority of acceptors and selectors
-# http.selectors=1
-# http.acceptors=1
-# http.selectorPriorityDelta=0
-# http.acceptorPriorityDelta=0
+## Connector socket linger time in seconds (-1 to disable)
+# jetty.http.soLingerTime=-1
+
+## Number of acceptors (-1 picks default based on number of cores)
+# jetty.http.acceptors=-1
+
+## Number of selectors (-1 picks default based on number of cores)
+# jetty.http.selectors=-1
+
+## ServerSocketChannel backlog (0 picks platform default)
+# jetty.http.acceptorQueueSize=0
+
+## Thread priority delta to give to acceptor threads
+# jetty.http.acceptorPriorityDelta=0
diff --git a/jetty-start/src/test/resources/dist-home/modules/http2.mod b/jetty-start/src/test/resources/dist-home/modules/http2.mod
index 2be7e7e524..585c1fa5ee 100644
--- a/jetty-start/src/test/resources/dist-home/modules/http2.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/http2.mod
@@ -13,6 +13,8 @@ lib/http2/*.jar
etc/jetty-http2.xml
[ini-template]
-## HTTP2 Configuration
+## Max number of concurrent streams per connection
+# jetty.http2.maxConcurrentStreams=1024
-# http2.maxConcurrentStreams=1024
+## Initial stream send (server to client) window
+# jetty.http2.initialStreamSendWindow=65535
diff --git a/jetty-start/src/test/resources/dist-home/modules/http2c.mod b/jetty-start/src/test/resources/dist-home/modules/http2c.mod
index 1073181bb3..15883cab2c 100644
--- a/jetty-start/src/test/resources/dist-home/modules/http2c.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/http2c.mod
@@ -1,5 +1,8 @@
#
# HTTP2 Clear Text Support Module
+# This module adds support for HTTP/2 clear text to the
+# HTTP/1 clear text connector (defined in jetty-http.xml).
+# The resulting connector will accept both HTTP/1 and HTTP/2 connections.
#
[depend]
@@ -12,11 +15,8 @@ lib/http2/*.jar
etc/jetty-http2c.xml
[ini-template]
-## HTTP2c Configuration
-
-# This module adds support for HTTP/2 clear text to the
-# HTTP/1 clear text connector (defined in jetty-http.xml)
-# The resulting connector will accept both HTTP/1 and HTTP/2
-# connections
+## Max number of concurrent streams per connection
+# jetty.http2.maxConcurrentStreams=1024
-# http2.maxConcurrentStreams=1024
+## Initial stream send (server to client) window
+# jetty.http2.initialStreamSendWindow=65535
diff --git a/jetty-start/src/test/resources/dist-home/modules/jaas.mod b/jetty-start/src/test/resources/dist-home/modules/jaas.mod
index 4932140ca6..fee3f59d87 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jaas.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jaas.mod
@@ -12,5 +12,6 @@ lib/jetty-jaas-${jetty.version}.jar
etc/jetty-jaas.xml
[ini-template]
-## JAAS Configuration
-jaas.login.conf=etc/login.conf
+## The file location (relative to $jetty.base) for the
+## JAAS "java.security.auth.login.config" system property
+# jetty.jaas.login.conf=etc/login.conf
diff --git a/jetty-start/src/test/resources/dist-home/modules/jmx-remote.mod b/jetty-start/src/test/resources/dist-home/modules/jmx-remote.mod
index b6be74afc9..f8a5111d8f 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jmx-remote.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jmx-remote.mod
@@ -9,10 +9,8 @@ jmx
etc/jetty-jmx-remote.xml
[ini-template]
-## JMX Configuration
-## Enable for an open port accessible by remote machines
-# jetty.jmxrmihost=localhost
-# jetty.jmxrmiport=1099
-## Strictly speaking you shouldn't need --exec to use this in most environments.
-## If this isn't working, make sure you enable --exec as well
-# -Dcom.sun.management.jmxremote
+## The host/address to bind RMI to
+# jetty.jmxremote.rmihost=localhost
+
+## The port RMI listens to
+# jetty.jmxremote.rmiport=1099
diff --git a/jetty-start/src/test/resources/dist-home/modules/logging.mod b/jetty-start/src/test/resources/dist-home/modules/logging.mod
index a39bfe4d23..1fe67627e1 100644
--- a/jetty-start/src/test/resources/dist-home/modules/logging.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/logging.mod
@@ -23,9 +23,14 @@ resources/
# Configure jetty logging for java.util.logging
# -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.JavaUtilLog
-# STDERR / STDOUT Logging
-# Number of days to retain logs
-# jetty.log.retain=90
-# Directory for logging output
-# Either a path relative to ${jetty.base} or an absolute path
-# jetty.logs=logs
+## Logging directory (relative to jetty.base)
+# jetty.logging.dir=logs
+
+## Whether to append to existing file
+# jetty.logging.append=false
+
+## How many days to retain old log files
+# jetty.logging.retainDays=90
+
+## Timezone of the log timestamps
+# jetty.logging.timezone=GMT
diff --git a/jetty-start/src/test/resources/dist-home/modules/lowresources.mod b/jetty-start/src/test/resources/dist-home/modules/lowresources.mod
index 99112d55fa..2f765d9af2 100644
--- a/jetty-start/src/test/resources/dist-home/modules/lowresources.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/lowresources.mod
@@ -9,10 +9,20 @@ server
etc/jetty-lowresources.xml
[ini-template]
-## Low Resources Configuration
-# lowresources.period=1050
-# lowresources.lowResourcesIdleTimeout=200
-# lowresources.monitorThreads=true
-# lowresources.maxConnections=0
-# lowresources.maxMemory=0
-# lowresources.maxLowResourcesTime=5000
+## Scan period to look for low resources (in milliseconds)
+# jetty.lowresources.period=1000
+
+## The idle timeout to apply to low resources (in milliseconds)
+# jetty.lowresources.idleTimeout=1000
+
+## Whether to monitor ThreadPool threads for low resources
+# jetty.lowresources.monitorThreads=true
+
+## Max number of connections allowed before being in low resources mode
+# jetty.lowresources.maxConnections=0
+
+## Max memory allowed before being in low resources mode (in bytes)
+# jetty.lowresources.maxMemory=0
+
+## Max time a resource may stay in low resource mode before actions are taken (in milliseconds)
+# jetty.lowresources.maxLowResourcesTime=5000
diff --git a/jetty-start/src/test/resources/dist-home/modules/proxy.mod b/jetty-start/src/test/resources/dist-home/modules/proxy.mod
index a879ae123e..6b91f68914 100644
--- a/jetty-start/src/test/resources/dist-home/modules/proxy.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/proxy.mod
@@ -14,9 +14,9 @@ etc/jetty-proxy.xml
[ini-template]
## Proxy Configuration
-#jetty.proxy.servletClass=org.eclipse.jetty.proxy.ProxyServlet
-#jetty.proxy.servletMapping=/*
-#jetty.proxy.maxThreads=128
-#jetty.proxy.maxConnections=256
-#jetty.proxy.idleTimeout=30000
-#jetty.proxy.timeout=60000
+# jetty.proxy.servletClass=org.eclipse.jetty.proxy.ProxyServlet
+# jetty.proxy.servletMapping=/*
+# jetty.proxy.maxThreads=128
+# jetty.proxy.maxConnections=256
+# jetty.proxy.idleTimeout=30000
+# jetty.proxy.timeout=60000
diff --git a/jetty-start/src/test/resources/dist-home/modules/requestlog.mod b/jetty-start/src/test/resources/dist-home/modules/requestlog.mod
index f5e0614eb4..89ad071f01 100644
--- a/jetty-start/src/test/resources/dist-home/modules/requestlog.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/requestlog.mod
@@ -12,19 +12,23 @@ etc/jetty-requestlog.xml
logs/
[ini-template]
-## Request Log Configuration
-# Filename for Request Log output (relative to jetty.base)
-# requestlog.filename=/logs/yyyy_mm_dd.request.log
+## File path (relative to $jetty.base)
+# jetty.requestlog.filePath=/logs/yyyy_mm_dd.request.log
+
# Date format for rollovered files (uses SimpleDateFormat syntax)
-# requestlog.filenameDateFormat=yyyy_MM_dd
-# How many days to retain the logs
-# requestlog.retain=90
-# If an existing log with the same name is found, just append to it
-# requestlog.append=true
-# Use the extended log output
-# requestlog.extended=true
-# Log http cookie information as well
-# requestlog.cookies=true
-# Set the log output timezone
-# requestlog.timezone=GMT
+# jetty.requestlog.filenameDateFormat=yyyy_MM_dd
+
+# How many days to retain old log files
+# jetty.requestlog.retainDays=90
+
+## Whether to append to existing file
+# jetty.requestlog.append=true
+
+# Whether to use the extended log output
+# jetty.requestlog.extended=true
+
+# Whether to log http cookie information
+# jetty.requestlog.cookies=true
+## Timezone of the log entries
+# jetty.requestlog.timezone=GMT
diff --git a/jetty-start/src/test/resources/dist-home/modules/rewrite.mod b/jetty-start/src/test/resources/dist-home/modules/rewrite.mod
index d2e00c8e89..c8a1750618 100644
--- a/jetty-start/src/test/resources/dist-home/modules/rewrite.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/rewrite.mod
@@ -10,3 +10,13 @@ lib/jetty-rewrite-${jetty.version}.jar
[xml]
etc/jetty-rewrite.xml
+
+[ini-template]
+## Whether to rewrite the request URI
+# jetty.rewrite.rewriteRequestURI=true
+
+## Whether to rewrite the path info
+# jetty.rewrite.rewritePathInfo=false
+
+## Request attribute key under with the original path is stored
+# jetty.rewrite.originalPathAttribute=requestedPath
diff --git a/jetty-start/src/test/resources/dist-home/modules/server.mod b/jetty-start/src/test/resources/dist-home/modules/server.mod
index b3f87de162..6b5dbe95ba 100644
--- a/jetty-start/src/test/resources/dist-home/modules/server.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/server.mod
@@ -20,30 +20,53 @@ lib/jetty-io-${jetty.version}.jar
etc/jetty.xml
[ini-template]
-##
-## Server Threading Configuration
-##
-# minimum number of threads
-threads.min=10
-# maximum number of threads
-threads.max=200
-# thread idle timeout in milliseconds
-threads.timeout=60000
-# buffer size for output
-jetty.output.buffer.size=32768
-# request header buffer size
-jetty.request.header.size=8192
-# response header buffer size
-jetty.response.header.size=8192
-# should jetty send the server version header?
-jetty.send.server.version=true
-# should jetty send the date header?
-jetty.send.date.header=false
-# What host to listen on (leave commented to listen on all interfaces)
-#jetty.host=myhost.com
-# Dump the state of the Jetty server, components, and webapps after startup
-jetty.dump.start=false
-# Dump the state of the Jetty server, before stop
-jetty.dump.stop=false
-# Enable delayed dispatch optimisation
-jetty.delayDispatchUntilContent=false
+### ThreadPool configuration
+## Minimum number of threads
+# jetty.threadPool.minThreads=10
+
+## Maximum number of threads
+# jetty.threadPool.maxThreads=200
+
+## Thread idle timeout (in milliseconds)
+# jetty.threadPool.idleTimeout=60000
+
+### Common HTTP configuration
+## Scheme to use to build URIs for secure redirects
+# jetty.httpConfig.secureScheme=https
+
+## Port to use to build URIs for secure redirects
+# jetty.httpConfig.securePort=8443
+
+## Response content buffer size (in bytes)
+# jetty.httpConfig.outputBufferSize=32768
+
+## Max response content write length that is buffered (in bytes)
+# jetty.httpConfig.outputAggregationSize=8192
+
+## Max request headers size (in bytes)
+# jetty.httpConfig.requestHeaderSize=8192
+
+## Max response headers size (in bytes)
+# jetty.httpConfig.responseHeaderSize=8192
+
+## Whether to send the Server: header
+# jetty.httpConfig.sendServerVersion=true
+
+## Whether to send the Date: header
+# jetty.httpConfig.sendDateHeader=false
+
+## Max per-connection header cache size (in nodes)
+# jetty.httpConfig.headerCacheSize=512
+
+## Whether, for requests with content, delay dispatch until some content has arrived
+# jetty.httpConfig.delayDispatchUntilContent=true
+
+### Server configuration
+## Whether ctrl+c on the console gracefully stops the Jetty server
+# jetty.server.stopAtShutdown=true
+
+## Dump the state of the Jetty server, components, and webapps after startup
+# jetty.server.dumpAfterStart=false
+
+## Dump the state of the Jetty server, components, and webapps before shutdown
+# jetty.server.dumpBeforeStop=false
diff --git a/jetty-start/src/test/resources/dist-home/modules/ssl.mod b/jetty-start/src/test/resources/dist-home/modules/ssl.mod
index a4d105088b..44b4e24ac6 100644
--- a/jetty-start/src/test/resources/dist-home/modules/ssl.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/ssl.mod
@@ -12,36 +12,54 @@ etc/jetty-ssl.xml
http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore
[ini-template]
-### SSL Keystore Configuration
-# define the port to use for secure redirection
-jetty.secure.port=8443
-
-# SSL port to listen on
-ssl.port=8443
-# SSL idle timeout in milliseconds
-ssl.timeout=30000
-# HTTPS Socket.soLingerTime in seconds. (-1 to disable)
-# ssl.soLingerTime=-1
-
-## Setup a demonstration keystore and truststore
-jetty.keystore=etc/keystore
-jetty.truststore=etc/keystore
-
-## Set the demonstration passwords.
+### TLS(SSL) Connector Configuration
+
+## Connector host/address to bind to
+# jetty.ssl.host=0.0.0.0
+
+## Connector port to listen on
+# jetty.ssl.port=443
+
+## Connector idle timeout in milliseconds
+# jetty.ssl.idleTimeout=30000
+
+## Connector socket linger time in seconds (-1 to disable)
+# jetty.ssl.soLingerTime=-1
+
+## Number of acceptors (-1 picks default based on number of cores)
+# jetty.ssl.acceptors=-1
+
+## Number of selectors (-1 picks default based on number of cores)
+# jetty.ssl.selectors=-1
+
+## ServerSocketChannel backlog (0 picks platform default)
+# jetty.ssl.acceptorQueueSize=0
+
+## Thread priority delta to give to acceptor threads
+# jetty.ssl.acceptorPriorityDelta=0
+
+### SslContextFactory Configuration
+
+## Keystore file path (relative to $jetty.base)
+# jetty.sslConfig.keystorePath=etc/keystore
+
+## Truststore file path (relative to $jetty.base)
+# jetty.sslConfig.truststorePath
+
## Note that OBF passwords are not secure, just protected from casual observation
## See http://www.eclipse.org/jetty/documentation/current/configuring-security-secure-passwords.html
-jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
-jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g
-jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
-
-### Set the client auth behavior
-## Set to true if client certificate authentication is required
-# jetty.ssl.needClientAuth=true
-## Set to true if client certificate authentication is desired
-# jetty.ssl.wantClientAuth=true
-
-## Parameters to control the number and priority of acceptors and selectors
-# ssl.selectors=1
-# ssl.acceptors=1
-# ssl.selectorPriorityDelta=0
-# ssl.acceptorPriorityDelta=0
+
+## Keystore password
+# jetty.sslConfig.keystorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
+
+## KeyManager password
+# jetty.sslConfig.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g
+
+## Truststore password
+# jetty.sslConfig.truststorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
+
+## whether client certificate authentication is required
+# jetty.sslConfig.needClientAuth=false
+
+## Whether client certificate authentication is desired
+# jetty.sslConfig.wantClientAuth=false
diff --git a/jetty-start/src/test/resources/dist-home/start.ini b/jetty-start/src/test/resources/dist-home/start.ini
index 141836874d..76987d97fa 100644
--- a/jetty-start/src/test/resources/dist-home/start.ini
+++ b/jetty-start/src/test/resources/dist-home/start.ini
@@ -43,29 +43,29 @@
## Server Threading Configuration
##
# minimum number of threads
-threads.min=10
+jetty.threadPool.minThreads=10
# maximum number of threads
-threads.max=200
+jetty.threadPool.maxThreads=200
# thread idle timeout in milliseconds
-threads.timeout=60000
+jetty.threadPool.idleTimeout=60000
# buffer size for output
-jetty.output.buffer.size=32768
+jetty.httpConfig.outputBufferSize=32768
# request header buffer size
-jetty.request.header.size=8192
+jetty.httpConfig.requestHeaderSize=8192
# response header buffer size
-jetty.response.header.size=8192
+jetty.httpConfig.responseHeaderSize=8192
# should jetty send the server version header?
-jetty.send.server.version=true
+jetty.httpConfig.sendServerVersion=true
# should jetty send the date header?
-jetty.send.date.header=false
+jetty.httpConfig.sendDateHeader=false
# What host to listen on (leave commented to listen on all interfaces)
-#jetty.host=myhost.com
+#jetty.http.host=myhost.com
# Dump the state of the Jetty server, components, and webapps after startup
-jetty.dump.start=false
+jetty.server.dumpAfterStart=false
# Dump the state of the Jetty server, before stop
-jetty.dump.stop=false
+jetty.server.dumpBeforeStop=false
# Enable delayed dispatch optimisation
-jetty.delayDispatchUntilContent=false
+jetty.httpConfig.delayDispatchUntilContent=false
# ---------------------------------------
# Module: http
@@ -73,19 +73,18 @@ jetty.delayDispatchUntilContent=false
### HTTP Connector Configuration
## HTTP port to listen on
-jetty.port=8080
+jetty.http.port=8080
## HTTP idle timeout in milliseconds
-http.timeout=30000
+# jetty.http.idleTimeout=30000
## HTTP Socket.soLingerTime in seconds. (-1 to disable)
-# http.soLingerTime=-1
+# jetty.http.soLingerTime=-1
## Parameters to control the number and priority of acceptors and selectors
-# http.selectors=1
-# http.acceptors=1
-# http.selectorPriorityDelta=0
-# http.acceptorPriorityDelta=0
+# jetty.http.selectors=1
+# jetty.http.acceptors=1
+# jetty.http.acceptorPriorityDelta=0
# ---------------------------------------
# Module: jndi
@@ -108,8 +107,7 @@ http.timeout=30000
--module=deploy
## DeployManager configuration
# Monitored Directory name (relative to jetty.base)
-# jetty.deploy.monitoredDirName=webapps
-
+# jetty.deploy.monitoredDir=webapps
# ---------------------------------------
# Module: plus
diff --git a/jetty-start/src/test/resources/usecases/agent-properties.assert.txt b/jetty-start/src/test/resources/usecases/agent-properties.assert.txt
index 19f00c3a97..e1a69ed047 100644
--- a/jetty-start/src/test/resources/usecases/agent-properties.assert.txt
+++ b/jetty-start/src/test/resources/usecases/agent-properties.assert.txt
@@ -16,18 +16,18 @@ LIB|${jetty.base}/lib/agent-jdk-1.6.jar
# The Properties we expect (order is irrelevant)
# (this is the property we actually set in jetty.base)
-PROP|jetty.port=9090
+PROP|jetty.http.port=9090
PROP|java.vm.specification.version=1.6
# (these are the ones set by default from jetty.home modules)
-PROP|http.timeout=30000
-PROP|jetty.delayDispatchUntilContent=false
-PROP|jetty.dump.start=false
-PROP|jetty.dump.stop=false
-PROP|jetty.output.buffer.size=32768
-PROP|jetty.request.header.size=8192
-PROP|jetty.response.header.size=8192
-PROP|jetty.send.date.header=false
-PROP|jetty.send.server.version=true
-PROP|threads.max=200
-PROP|threads.min=10
-PROP|threads.timeout=60000
+# PROP|jetty.http.idleTimeout=30000
+# PROP|jetty.httpConfig.delayDispatchUntilContent=false
+# PROP|jetty.server.dumpAfterStart=false
+# PROP|jetty.server.dumpBeforeStop=false
+# PROP|jetty.httpConfig.outputBufferSize=32768
+# PROP|jetty.httpConfig.requestHeaderSize=8192
+# PROP|jetty.httpConfig.responseHeaderSize=8192
+# PROP|jetty.httpConfig.sendDateHeader=false
+# PROP|jetty.httpConfig.sendServerVersion=true
+# PROP|jetty.threadPool.maxThreads=200
+# PROP|jetty.threadPool.minThreads=10
+# PROP|jetty.threadPool.idleTimeout=60000
diff --git a/jetty-start/src/test/resources/usecases/agent-properties/start.ini b/jetty-start/src/test/resources/usecases/agent-properties/start.ini
index 198a07c499..db061d885b 100644
--- a/jetty-start/src/test/resources/usecases/agent-properties/start.ini
+++ b/jetty-start/src/test/resources/usecases/agent-properties/start.ini
@@ -1,4 +1,4 @@
--module=http,agent
-jetty.port=9090
+jetty.http.port=9090
diff --git a/jetty-start/src/test/resources/usecases/assert-enable-spdy-bad-npn-version.txt b/jetty-start/src/test/resources/usecases/assert-enable-spdy-bad-npn-version.txt
index 84c8867d38..76a5b5c3b2 100644
--- a/jetty-start/src/test/resources/usecases/assert-enable-spdy-bad-npn-version.txt
+++ b/jetty-start/src/test/resources/usecases/assert-enable-spdy-bad-npn-version.txt
@@ -3,12 +3,12 @@
# The LIBs we expect (order is irrelevant)
# The Properties we expect (order is irrelevant)
-PROP|jetty.port=9090
-PROP|jetty.keystore=etc/keystore
-PROP|jetty.keystore.password=friendly
-PROP|jetty.keymanager.password=icecream
-PROP|jetty.truststore=etc/keystore
-PROP|jetty.truststore.password=sundae
+PROP|jetty.http.port=9090
+PROP|jetty.sslConfig.keyStorePath=etc/keystore
+PROP|jetty.sslConfig.keyStorePassword=friendly
+PROP|jetty.sslConfig.keyManagerPassword=icecream
+PROP|jetty.sslConfig.trustStorePath=etc/keystore
+PROP|jetty.sslConfig.trustStorePassword=sundae
PROP|java.version=1.7.0_01
# The Downloads
diff --git a/jetty-start/src/test/resources/usecases/assert-with-module-persistence.txt b/jetty-start/src/test/resources/usecases/assert-with-module-persistence.txt
index 75fb89ce9f..c72fa647d8 100644
--- a/jetty-start/src/test/resources/usecases/assert-with-module-persistence.txt
+++ b/jetty-start/src/test/resources/usecases/assert-with-module-persistence.txt
@@ -33,12 +33,12 @@ LIB|${jetty.home}/lib/websocket/websocket-server-TEST.jar
LIB|${jetty.home}/lib/websocket/websocket-servlet-TEST.jar
# The Properties we expect (order is irrelevant)
-PROP|jetty.port=12345
-PROP|jetty.keystore=etc/keystore
-PROP|jetty.keystore.password=friendly
-PROP|jetty.keymanager.password=icecream
-PROP|jetty.truststore=etc/keystore
-PROP|jetty.truststore.password=sundae
+PROP|jetty.http.port=12345
+PROP|jetty.sslConfig.keyStorePath=etc/keystore
+PROP|jetty.sslConfig.keyStorePassword=friendly
+PROP|jetty.sslConfig.keyManagerPassword=icecream
+PROP|jetty.sslConfig.trustStorePath=etc/keystore
+PROP|jetty.sslConfig.trustStorePassword=sundae
# JVM Args
# JVM|-Xms1024m
diff --git a/jetty-start/src/test/resources/usecases/barebones.assert.txt b/jetty-start/src/test/resources/usecases/barebones.assert.txt
index 3393d78759..6f933edd33 100644
--- a/jetty-start/src/test/resources/usecases/barebones.assert.txt
+++ b/jetty-start/src/test/resources/usecases/barebones.assert.txt
@@ -13,17 +13,17 @@ LIB|${jetty.home}/lib/servlet-api-3.1.jar
# The Properties we expect (order is irrelevant)
# (this is the property we actually set in jetty.base)
-PROP|jetty.port=9090
+PROP|jetty.http.port=9090
# (these are the ones set by default from jetty.home modules)
-PROP|http.timeout=30000
-PROP|jetty.delayDispatchUntilContent=false
-PROP|jetty.dump.start=false
-PROP|jetty.dump.stop=false
-PROP|jetty.output.buffer.size=32768
-PROP|jetty.request.header.size=8192
-PROP|jetty.response.header.size=8192
-PROP|jetty.send.date.header=false
-PROP|jetty.send.server.version=true
-PROP|threads.max=200
-PROP|threads.min=10
-PROP|threads.timeout=60000
+# PROP|jetty.http.idleTimeout=30000
+# PROP|jetty.httpConfig.delayDispatchUntilContent=false
+# PROP|jetty.server.dumpAfterStart=false
+# PROP|jetty.server.dumpBeforeStop=false
+# PROP|jetty.httpConfig.outputBufferSize=32768
+# PROP|jetty.httpConfig.requestHeaderSize=8192
+# PROP|jetty.httpConfig.responseHeaderSize=8192
+# PROP|jetty.httpConfig.sendDateHeader=false
+# PROP|jetty.httpConfig.sendServerVersion=true
+# PROP|jetty.threadPool.maxThreads=200
+# PROP|jetty.threadPool.minThreads=10
+# PROP|jetty.threadPool.idleTimeout=60000
diff --git a/jetty-start/src/test/resources/usecases/barebones/start.ini b/jetty-start/src/test/resources/usecases/barebones/start.ini
index 1c0e065afd..a3d92b9524 100644
--- a/jetty-start/src/test/resources/usecases/barebones/start.ini
+++ b/jetty-start/src/test/resources/usecases/barebones/start.ini
@@ -2,4 +2,4 @@
--module=server
--module=http
-jetty.port=9090
+jetty.http.port=9090
diff --git a/jetty-start/src/test/resources/usecases/basic-properties.assert.txt b/jetty-start/src/test/resources/usecases/basic-properties.assert.txt
index 7dbf4fcbd4..df9ae27f5b 100644
--- a/jetty-start/src/test/resources/usecases/basic-properties.assert.txt
+++ b/jetty-start/src/test/resources/usecases/basic-properties.assert.txt
@@ -13,18 +13,18 @@ LIB|${jetty.home}/lib/servlet-api-3.1.jar
# The Properties we expect (order is irrelevant)
# (this is the property we actually set in jetty.base)
-PROP|jetty.port=9090
+PROP|jetty.http.port=9090
PROP|port=9090
# (these are the ones set by default from jetty.home modules)
-PROP|http.timeout=30000
-PROP|jetty.delayDispatchUntilContent=false
-PROP|jetty.dump.start=false
-PROP|jetty.dump.stop=false
-PROP|jetty.output.buffer.size=32768
-PROP|jetty.request.header.size=8192
-PROP|jetty.response.header.size=8192
-PROP|jetty.send.date.header=false
-PROP|jetty.send.server.version=true
-PROP|threads.max=200
-PROP|threads.min=10
-PROP|threads.timeout=60000 \ No newline at end of file
+# PROP|jetty.http.idleTimeout=30000
+# PROP|jetty.httpConfig.delayDispatchUntilContent=false
+# PROP|jetty.server.dumpAfterStart=false
+# PROP|jetty.server.dumpBeforeStop=false
+# PROP|jetty.httpConfig.outputBufferSize=32768
+# PROP|jetty.httpConfig.requestHeaderSize=8192
+# PROP|jetty.httpConfig.responseHeaderSize=8192
+# PROP|jetty.httpConfig.sendDateHeader=false
+# PROP|jetty.httpConfig.sendServerVersion=true
+# PROP|jetty.threadPool.maxThreads=200
+# PROP|jetty.threadPool.minThreads=10
+# PROP|jetty.threadPool.idleTimeout=60000
diff --git a/jetty-start/src/test/resources/usecases/basic-properties/start.ini b/jetty-start/src/test/resources/usecases/basic-properties/start.ini
index f80bdb23b1..eaef9da9e0 100644
--- a/jetty-start/src/test/resources/usecases/basic-properties/start.ini
+++ b/jetty-start/src/test/resources/usecases/basic-properties/start.ini
@@ -2,4 +2,4 @@
--module=server
--module=http
-jetty.port=${port}
+jetty.http.port=${port}
diff --git a/jetty-start/src/test/resources/usecases/database.assert.txt b/jetty-start/src/test/resources/usecases/database.assert.txt
index 31d9c27632..fbd4bebd84 100644
--- a/jetty-start/src/test/resources/usecases/database.assert.txt
+++ b/jetty-start/src/test/resources/usecases/database.assert.txt
@@ -26,22 +26,22 @@ LIB|${jetty.base}/lib/db/bonecp.jar
# The Properties we expect (order is irrelevant)
# (this is the property we actually set in jetty.base)
-PROP|jetty.port=9090
+PROP|jetty.http.port=9090
PROP|mysql.user=frank
PROP|mysql.pass=secret
# (these are the ones set by default from jetty.home modules)
-PROP|http.timeout=30000
-PROP|jetty.delayDispatchUntilContent=false
-PROP|jetty.dump.start=false
-PROP|jetty.dump.stop=false
-PROP|jetty.output.buffer.size=32768
-PROP|jetty.request.header.size=8192
-PROP|jetty.response.header.size=8192
-PROP|jetty.send.date.header=false
-PROP|jetty.send.server.version=true
-PROP|threads.max=200
-PROP|threads.min=10
-PROP|threads.timeout=60000
+# PROP|jetty.http.idleTimeout=30000
+# PROP|jetty.httpConfig.delayDispatchUntilContent=false
+# PROP|jetty.server.dumpAfterStart=false
+# PROP|jetty.server.dumpBeforeStop=false
+# PROP|jetty.httpConfig.outputBufferSize=32768
+# PROP|jetty.httpConfig.requestHeaderSize=8192
+# PROP|jetty.httpConfig.responseHeaderSize=8192
+# PROP|jetty.httpConfig.sendDateHeader=false
+# PROP|jetty.httpConfig.sendServerVersion=true
+# PROP|jetty.threadPool.maxThreads=200
+# PROP|jetty.threadPool.minThreads=10
+# PROP|jetty.threadPool.idleTimeout=60000
# Files / Directories to create
FILE|webapps/
diff --git a/jetty-start/src/test/resources/usecases/database/start.ini b/jetty-start/src/test/resources/usecases/database/start.ini
index d5513df249..a9a013bb45 100644
--- a/jetty-start/src/test/resources/usecases/database/start.ini
+++ b/jetty-start/src/test/resources/usecases/database/start.ini
@@ -4,4 +4,4 @@
mysql.user=frank
mysql.pass=secret
-jetty.port=9090
+jetty.http.port=9090
diff --git a/jetty-start/src/test/resources/usecases/deep-ext.assert.txt b/jetty-start/src/test/resources/usecases/deep-ext.assert.txt
index 38712d9578..8b18c19866 100644
--- a/jetty-start/src/test/resources/usecases/deep-ext.assert.txt
+++ b/jetty-start/src/test/resources/usecases/deep-ext.assert.txt
@@ -19,20 +19,20 @@ LIB|${jetty.base}/lib/ext/logging/logback-classic.jar
# The Properties we expect (order is irrelevant)
# (this is the property we actually set in jetty.base)
-PROP|jetty.port=9090
+PROP|jetty.http.port=9090
# (these are the ones set by default from jetty.home modules)
-PROP|http.timeout=30000
-PROP|jetty.delayDispatchUntilContent=false
-PROP|jetty.dump.start=false
-PROP|jetty.dump.stop=false
-PROP|jetty.output.buffer.size=32768
-PROP|jetty.request.header.size=8192
-PROP|jetty.response.header.size=8192
-PROP|jetty.send.date.header=false
-PROP|jetty.send.server.version=true
-PROP|threads.max=200
-PROP|threads.min=10
-PROP|threads.timeout=60000
+# PROP|jetty.http.idleTimeout=30000
+# PROP|jetty.httpConfig.delayDispatchUntilContent=false
+# PROP|jetty.server.dumpAfterStart=false
+# PROP|jetty.server.dumpBeforeStop=false
+# PROP|jetty.httpConfig.outputBufferSize=32768
+# PROP|jetty.httpConfig.requestHeaderSize=8192
+# PROP|jetty.httpConfig.responseHeaderSize=8192
+# PROP|jetty.httpConfig.sendDateHeader=false
+# PROP|jetty.httpConfig.sendServerVersion=true
+# PROP|jetty.threadPool.maxThreads=200
+# PROP|jetty.threadPool.minThreads=10
+# PROP|jetty.threadPool.idleTimeout=60000
# Files / Directories to create
FILE|lib/
diff --git a/jetty-start/src/test/resources/usecases/deep-ext/start.ini b/jetty-start/src/test/resources/usecases/deep-ext/start.ini
index c8fa93065c..2165a30ff5 100644
--- a/jetty-start/src/test/resources/usecases/deep-ext/start.ini
+++ b/jetty-start/src/test/resources/usecases/deep-ext/start.ini
@@ -3,4 +3,4 @@
--module=http
--module=ext
-jetty.port=9090
+jetty.http.port=9090
diff --git a/jetty-start/src/test/resources/usecases/http2.assert.txt b/jetty-start/src/test/resources/usecases/http2.assert.txt
index 7510468136..ed4b8d1f2c 100644
--- a/jetty-start/src/test/resources/usecases/http2.assert.txt
+++ b/jetty-start/src/test/resources/usecases/http2.assert.txt
@@ -23,30 +23,30 @@ LIB|${jetty.home}/lib/http2/http2-server-TEST.jar
# The Properties we expect (order is irrelevant)
# (this is the property we actually set in jetty.base)
-PROP|jetty.port=9090
-PROP|jetty.secure.port=8443
-PROP|jetty.keystore=etc/keystore
-PROP|jetty.keystore.password=friendly
-PROP|jetty.keymanager.password=icecream
-PROP|jetty.truststore=etc/keystore
-PROP|jetty.truststore.password=sundae
+PROP|jetty.http.port=9090
PROP|java.version=1.7.0_60
-PROP|ssl.port=8443
-PROP|ssl.timeout=30000
+PROP|jetty.sslConfig.keyStorePath=etc/keystore
+PROP|jetty.sslConfig.keyStorePassword=friendly
+PROP|jetty.sslConfig.keyManagerPassword=icecream
+PROP|jetty.sslConfig.trustStorePath=etc/keystore
+PROP|jetty.sslConfig.trustStorePassword=sundae
# (these are the ones set by default from jetty.home modules)
-PROP|http.timeout=30000
-PROP|jetty.delayDispatchUntilContent=false
-PROP|jetty.dump.start=false
-PROP|jetty.dump.stop=false
-PROP|jetty.output.buffer.size=32768
-PROP|jetty.request.header.size=8192
-PROP|jetty.response.header.size=8192
-PROP|jetty.send.date.header=false
-PROP|jetty.send.server.version=true
-PROP|threads.max=200
-PROP|threads.min=10
-PROP|threads.timeout=60000
-
+PROP|jetty.alpn.debug=false
+# PROP|jetty.httpConfig.securePort=8443
+# PROP|jetty.ssl.port=8443
+# PROP|jetty.ssl.idleTimeout=30000
+# PROP|jetty.http.idleTimeout=30000
+# PROP|jetty.httpConfig.delayDispatchUntilContent=false
+# PROP|jetty.server.dumpAfterStart=false
+# PROP|jetty.server.dumpBeforeStop=false
+# PROP|jetty.httpConfig.outputBufferSize=32768
+# PROP|jetty.httpConfig.requestHeaderSize=8192
+# PROP|jetty.httpConfig.responseHeaderSize=8192
+# PROP|jetty.httpConfig.sendDateHeader=false
+# PROP|jetty.httpConfig.sendServerVersion=true
+# PROP|jetty.threadPool.maxThreads=200
+# PROP|jetty.threadPool.minThreads=10
+# PROP|jetty.threadPool.idleTimeout=60000
# The Downloads
DOWNLOAD|maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
@@ -58,4 +58,3 @@ BOOTLIB|-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
# The Files
FILE|lib/
FILE|lib/alpn/
-
diff --git a/jetty-start/src/test/resources/usecases/http2/start.ini b/jetty-start/src/test/resources/usecases/http2/start.ini
index 5faab28161..efd563084e 100644
--- a/jetty-start/src/test/resources/usecases/http2/start.ini
+++ b/jetty-start/src/test/resources/usecases/http2/start.ini
@@ -1,12 +1,12 @@
--module=server,http,jmx,http2
-jetty.port=9090
+jetty.http.port=9090
# Some SSL keystore configuration
-jetty.keystore=etc/keystore
-jetty.keystore.password=friendly
-jetty.keymanager.password=icecream
-jetty.truststore=etc/keystore
-jetty.truststore.password=sundae
+jetty.sslConfig.keyStorePath=etc/keystore
+jetty.sslConfig.keyStorePassword=friendly
+jetty.sslConfig.keyManagerPassword=icecream
+jetty.sslConfig.trustStorePath=etc/keystore
+jetty.sslConfig.trustStorePassword=sundae
diff --git a/jetty-start/src/test/resources/usecases/include-jetty-dir-logging.assert.txt b/jetty-start/src/test/resources/usecases/include-jetty-dir-logging.assert.txt
index d238196059..85453e8674 100644
--- a/jetty-start/src/test/resources/usecases/include-jetty-dir-logging.assert.txt
+++ b/jetty-start/src/test/resources/usecases/include-jetty-dir-logging.assert.txt
@@ -18,20 +18,20 @@ LIB|${maven-test-resources}/extra-jetty-dirs/logging/lib/logging/logback.jar
# The Properties we expect (order is irrelevant)
# (this is the property we actually set in jetty.base)
-PROP|jetty.port=9090
+PROP|jetty.http.port=9090
# (these are the ones set by default from jetty.home modules)
-PROP|http.timeout=30000
-PROP|jetty.delayDispatchUntilContent=false
-PROP|jetty.dump.start=false
-PROP|jetty.dump.stop=false
-PROP|jetty.output.buffer.size=32768
-PROP|jetty.request.header.size=8192
-PROP|jetty.response.header.size=8192
-PROP|jetty.send.date.header=false
-PROP|jetty.send.server.version=true
-PROP|threads.max=200
-PROP|threads.min=10
-PROP|threads.timeout=60000
+# PROP|jetty.http.idleTimeout=30000
+# PROP|jetty.httpConfig.delayDispatchUntilContent=false
+# PROP|jetty.server.dumpAfterStart=false
+# PROP|jetty.server.dumpBeforeStop=false
+# PROP|jetty.httpConfig.outputBufferSize=32768
+# PROP|jetty.httpConfig.requestHeaderSize=8192
+# PROP|jetty.httpConfig.responseHeaderSize=8192
+# PROP|jetty.httpConfig.sendDateHeader=false
+# PROP|jetty.httpConfig.sendServerVersion=true
+# PROP|jetty.threadPool.maxThreads=200
+# PROP|jetty.threadPool.minThreads=10
+# PROP|jetty.threadPool.idleTimeout=60000
# Files
FILE|logs/
diff --git a/jetty-start/src/test/resources/usecases/include-jetty-dir-logging/start.ini b/jetty-start/src/test/resources/usecases/include-jetty-dir-logging/start.ini
index ce3bff24b1..d44a453ed0 100644
--- a/jetty-start/src/test/resources/usecases/include-jetty-dir-logging/start.ini
+++ b/jetty-start/src/test/resources/usecases/include-jetty-dir-logging/start.ini
@@ -3,4 +3,4 @@
--module=server,http,jmx
#--module=resources
-jetty.port=9090
+jetty.http.port=9090
diff --git a/jetty-start/src/test/resources/usecases/jmx.assert.txt b/jetty-start/src/test/resources/usecases/jmx.assert.txt
index 28dea2e98b..4bfc6903d8 100644
--- a/jetty-start/src/test/resources/usecases/jmx.assert.txt
+++ b/jetty-start/src/test/resources/usecases/jmx.assert.txt
@@ -15,17 +15,17 @@ LIB|${jetty.home}/lib/servlet-api-3.1.jar
# The Properties we expect (order is irrelevant)
# (this is the property we actually set in jetty.base)
-PROP|jetty.port=9090
+PROP|jetty.http.port=9090
# (these are the ones set by default from jetty.home modules)
-PROP|http.timeout=30000
-PROP|jetty.delayDispatchUntilContent=false
-PROP|jetty.dump.start=false
-PROP|jetty.dump.stop=false
-PROP|jetty.output.buffer.size=32768
-PROP|jetty.request.header.size=8192
-PROP|jetty.response.header.size=8192
-PROP|jetty.send.date.header=false
-PROP|jetty.send.server.version=true
-PROP|threads.max=200
-PROP|threads.min=10
-PROP|threads.timeout=60000
+# PROP|jetty.http.idleTimeout=30000
+# PROP|jetty.httpConfig.delayDispatchUntilContent=false
+# PROP|jetty.server.dumpAfterStart=false
+# PROP|jetty.server.dumpBeforeStop=false
+# PROP|jetty.httpConfig.outputBufferSize=32768
+# PROP|jetty.httpConfig.requestHeaderSize=8192
+# PROP|jetty.httpConfig.responseHeaderSize=8192
+# PROP|jetty.httpConfig.sendDateHeader=false
+# PROP|jetty.httpConfig.sendServerVersion=true
+# PROP|jetty.threadPool.maxThreads=200
+# PROP|jetty.threadPool.minThreads=10
+# PROP|jetty.threadPool.idleTimeout=60000
diff --git a/jetty-start/src/test/resources/usecases/jmx/start.ini b/jetty-start/src/test/resources/usecases/jmx/start.ini
index d3950e6c02..5339629da2 100644
--- a/jetty-start/src/test/resources/usecases/jmx/start.ini
+++ b/jetty-start/src/test/resources/usecases/jmx/start.ini
@@ -1,4 +1,4 @@
--module=server,http,jmx
-jetty.port=9090
+jetty.http.port=9090
diff --git a/jetty-start/src/test/resources/usecases/jsp.assert.txt b/jetty-start/src/test/resources/usecases/jsp.assert.txt
index 533a51fcdf..cf6d3a4ab0 100644
--- a/jetty-start/src/test/resources/usecases/jsp.assert.txt
+++ b/jetty-start/src/test/resources/usecases/jsp.assert.txt
@@ -30,20 +30,20 @@ LIB|${jetty.home}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.9.M3.jar
# The Properties we expect (order is irrelevant)
# (these are the properties we actually set in the configuration)
-PROP|jetty.port=9090
+PROP|jetty.http.port=9090
# (these are the ones set by default from jetty.home modules)
-PROP|http.timeout=30000
-PROP|jetty.delayDispatchUntilContent=false
-PROP|jetty.dump.start=false
-PROP|jetty.dump.stop=false
-PROP|jetty.output.buffer.size=32768
-PROP|jetty.request.header.size=8192
-PROP|jetty.response.header.size=8192
-PROP|jetty.send.date.header=false
-PROP|jetty.send.server.version=true
-PROP|threads.max=200
-PROP|threads.min=10
-PROP|threads.timeout=60000
+# PROP|jetty.http.idleTimeout=30000
+# PROP|jetty.httpConfig.delayDispatchUntilContent=false
+# PROP|jetty.server.dumpAfterStart=false
+# PROP|jetty.server.dumpBeforeStop=false
+# PROP|jetty.httpConfig.outputBufferSize=32768
+# PROP|jetty.httpConfig.requestHeaderSize=8192
+# PROP|jetty.httpConfig.responseHeaderSize=8192
+# PROP|jetty.httpConfig.sendDateHeader=false
+# PROP|jetty.httpConfig.sendServerVersion=true
+# PROP|jetty.threadPool.maxThreads=200
+# PROP|jetty.threadPool.minThreads=10
+# PROP|jetty.threadPool.idleTimeout=60000
# Files / Directories to create
# FILE|lib/
diff --git a/jetty-start/src/test/resources/usecases/jsp/start.ini b/jetty-start/src/test/resources/usecases/jsp/start.ini
index bf58fa82d7..f01871c4ef 100644
--- a/jetty-start/src/test/resources/usecases/jsp/start.ini
+++ b/jetty-start/src/test/resources/usecases/jsp/start.ini
@@ -3,4 +3,4 @@
--module=http
--module=jsp
-jetty.port=9090
+jetty.http.port=9090
diff --git a/jetty-start/src/test/resources/usecases/logging.assert.txt b/jetty-start/src/test/resources/usecases/logging.assert.txt
index ce72b68ec4..4b5df4c365 100644
--- a/jetty-start/src/test/resources/usecases/logging.assert.txt
+++ b/jetty-start/src/test/resources/usecases/logging.assert.txt
@@ -18,20 +18,21 @@ LIB|${jetty.base}/resources
# The Properties we expect (order is irrelevant)
# (this is the property we actually set in jetty.base)
-PROP|jetty.port=9090
+PROP|jetty.http.port=9090
# (these are the ones set by default from jetty.home modules)
-PROP|http.timeout=30000
-PROP|jetty.delayDispatchUntilContent=false
-PROP|jetty.dump.start=false
-PROP|jetty.dump.stop=false
-PROP|jetty.output.buffer.size=32768
-PROP|jetty.request.header.size=8192
-PROP|jetty.response.header.size=8192
-PROP|jetty.send.date.header=false
-PROP|jetty.send.server.version=true
-PROP|threads.max=200
-PROP|threads.min=10
-PROP|threads.timeout=60000
+# PROP|jetty.http.idleTimeout=30000
+# PROP|jetty.httpConfig.delayDispatchUntilContent=false
+# PROP|jetty.server.dumpAfterStart=false
+# PROP|jetty.server.dumpBeforeStop=false
+# PROP|jetty.httpConfig.outputBufferSize=32768
+# PROP|jetty.httpConfig.requestHeaderSize=8192
+# PROP|jetty.httpConfig.responseHeaderSize=8192
+# PROP|jetty.httpConfig.sendDateHeader=false
+# PROP|jetty.httpConfig.sendServerVersion=true
+# PROP|jetty.threadPool.maxThreads=200
+# PROP|jetty.threadPool.minThreads=10
+# PROP|jetty.threadPool.idleTimeout=60000
+
# Other File References
FILE|logs/
FILE|resources/
diff --git a/jetty-start/src/test/resources/usecases/logging/start.ini b/jetty-start/src/test/resources/usecases/logging/start.ini
index e18ff3dbf7..083675e183 100644
--- a/jetty-start/src/test/resources/usecases/logging/start.ini
+++ b/jetty-start/src/test/resources/usecases/logging/start.ini
@@ -4,4 +4,4 @@
--module=logging
--module=resources
-jetty.port=9090
+jetty.http.port=9090

Back to the top