diff options
| author | Joakim Erdfelt | 2015-06-11 13:57:37 +0000 |
|---|---|---|
| committer | Joakim Erdfelt | 2015-06-11 13:57:37 +0000 |
| commit | 173acf1ae0919790bc63969bc0b2fcf5455c5cb3 (patch) | |
| tree | 5c819f1b9b82703d99fdf54112f695f378cfdecc /jetty-start/src/test | |
| parent | aaf0d8889dd8004515a41ede30ae907534e77249 (diff) | |
| parent | b670b9e47d82421b5ca7126a00d7707977c41e56 (diff) | |
| download | org.eclipse.jetty.project-173acf1ae0919790bc63969bc0b2fcf5455c5cb3.tar.gz org.eclipse.jetty.project-173acf1ae0919790bc63969bc0b2fcf5455c5cb3.tar.xz org.eclipse.jetty.project-173acf1ae0919790bc63969bc0b2fcf5455c5cb3.zip | |
Merge branch 'bugs/469860'
Diffstat (limited to 'jetty-start/src/test')
153 files changed, 716 insertions, 726 deletions
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/DistTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/DistTest.java index 847601dbab..1d08deacca 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/DistTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/DistTest.java @@ -20,6 +20,7 @@ package org.eclipse.jetty.start; import static org.eclipse.jetty.start.StartMatchers.fileExists; import static org.eclipse.jetty.start.StartMatchers.notPathExists; +import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertThat; import java.nio.file.Files; @@ -83,10 +84,29 @@ public class DistTest Path basePath = testdir.getEmptyDir().toPath(); List<String> cmds = getBaseCommandLine(basePath); - cmds.add("--add-to-start=jstl"); - execMain(cmds); + + Path startIni = basePath.resolve("start.ini"); + assertThat("start.ini", startIni, fileExists()); + + List<String> startIniLines = new TextFile(startIni).getLines(); + // Modules that should be present + assertThat("start.ini", startIniLines, hasItem("--module=jstl")); + assertThat("start.ini", startIniLines, hasItem("--module=server")); + + // Test for modules that should not be present. + // Namely modules that are transitive and without ini-template. + assertThat("start.ini", startIniLines, not(hasItem("--module=servlet"))); + assertThat("start.ini", startIniLines, not(hasItem("--module=apache-jsp"))); + assertThat("start.ini", startIniLines, not(hasItem("--module=apache-jstl"))); + assertThat("start.ini", startIniLines, not(hasItem("--module=jndi"))); + assertThat("start.ini", startIniLines, not(hasItem("--module=security"))); + assertThat("start.ini", startIniLines, not(hasItem("--module=webapp"))); + assertThat("start.ini", startIniLines, not(hasItem("--module=plus"))); + assertThat("start.ini", startIniLines, not(hasItem("--module=annotations"))); + assertThat("start.ini", startIniLines, not(hasItem("--module=jsp"))); + } /** 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 5724c488e4..dbbe5f481a 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 @@ -24,6 +24,7 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; +import org.eclipse.jetty.start.util.RebuildTestResources; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.toolchain.test.TestTracker; import org.junit.Before; @@ -45,6 +46,7 @@ public class MainTest { System.setProperty("jetty.home",""); System.setProperty("jetty.base",""); + System.setProperty("jetty.version",RebuildTestResources.JETTY_VERSION); } @Test @@ -54,7 +56,7 @@ public class MainTest Path testJettyHome = MavenTestingUtils.getTestResourceDir("dist-home").toPath().toRealPath(); cmdLineArgs.add("user.dir=" + testJettyHome); cmdLineArgs.add("jetty.home=" + testJettyHome); - cmdLineArgs.add("jetty.http.port=9090"); + // cmdLineArgs.add("jetty.http.port=9090"); Main main = new Main(); StartArgs args = main.processCommandLine(cmdLineArgs.toArray(new String[cmdLineArgs.size()])); @@ -84,13 +86,13 @@ public class MainTest } @Test - @Ignore("Just a bit noisy for general testing") + @Ignore("Too noisy for general testing") public void testListConfig() throws Exception { List<String> cmdLineArgs = new ArrayList<>(); File testJettyHome = MavenTestingUtils.getTestResourceDir("dist-home"); + cmdLineArgs.add("user.dir=" + testJettyHome); cmdLineArgs.add("jetty.home=" + testJettyHome); - 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 e828cc2c32..ba2fd76099 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 @@ -142,6 +142,9 @@ public class ModulesTest expected.add("stats"); expected.add("webapp"); expected.add("websocket"); + expected.add("infinispan"); + expected.add("jdbc-sessions"); + expected.add("nosql"); ConfigurationAssert.assertContainsUnordered("All Modules",expected,moduleNames); } @@ -247,6 +250,7 @@ public class ModulesTest expected.add("deploy"); expected.add("plus"); expected.add("annotations"); + expected.add("jdbc-sessions"); List<String> resolved = new ArrayList<>(); for (Module module : modules.getSelected()) diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/PropertyPassingTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/PropertyPassingTest.java index 52e92d5e9d..e325e09eb7 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/PropertyPassingTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/PropertyPassingTest.java @@ -18,8 +18,7 @@ package org.eclipse.jetty.start; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.*; import java.io.BufferedReader; import java.io.File; @@ -89,7 +88,7 @@ public class PropertyPassingTest @Rule public TestingDir testingdir = new TestingDir(); - + @Test public void testAsJvmArg() throws IOException, InterruptedException { diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java b/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java index 28f80f3ccc..e2c21410a8 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java @@ -24,6 +24,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import org.eclipse.jetty.start.util.RebuildTestResources; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.junit.Rule; import org.junit.Test; @@ -48,6 +49,10 @@ public class TestBadUseCases "Missing referenced dependency: alpn-impl/alpn-1.7.0_01", new String[]{"java.version=1.7.0_01"}}); + ret.add(new Object[]{ "versioned-modules-too-new", + "Module [http3] specifies jetty version [10.0] which is newer than this version of jetty [" + RebuildTestResources.JETTY_VERSION + "]", + null}); + return ret; } @@ -66,6 +71,7 @@ public class TestBadUseCases @Test public void testBadConfig() throws Exception { + System.setProperty("jetty.version", RebuildTestResources.JETTY_VERSION); File homeDir = MavenTestingUtils.getTestResourceDir("dist-home"); File baseDir = MavenTestingUtils.getTestResourceDir("usecases/" + caseName); diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java b/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java index f6c25afae9..86f06a19f7 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java @@ -22,6 +22,7 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; +import org.eclipse.jetty.start.util.RebuildTestResources; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,6 +48,7 @@ public class TestUseCases ret.add(new String[] {"jsp", null}); ret.add(new String[] {"database", null}); ret.add(new String[] {"deep-ext", null}); + ret.add(new String[] {"versioned-modules", null}); // Ones with command lines ret.add(new Object[] {"http2", new String[]{"java.version=1.7.0_60"}}); @@ -68,6 +70,8 @@ public class TestUseCases Path homeDir = MavenTestingUtils.getTestResourceDir("dist-home").toPath().toRealPath(); Path baseDir = MavenTestingUtils.getTestResourceDir("usecases/" + caseName).toPath().toRealPath(); + System.setProperty("jetty.version",RebuildTestResources.JETTY_VERSION); + Main main = new Main(); List<String> cmdLine = new ArrayList<>(); cmdLine.add("jetty.home=" + homeDir.toString()); diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/VersionTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/VersionTest.java index 7e61d1f297..81727e2354 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/VersionTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/VersionTest.java @@ -18,48 +18,55 @@ package org.eclipse.jetty.start; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; import org.junit.Test; public class VersionTest { @Test - public void testDefaultVersion() - { - Version version = new Version(); - assertEquals("Default version difference to 0.0.0",0,version.compare(new Version("0.0.0"))); - } - - @Test public void testNewerVersion() { assertIsNewer("0.0.0", "0.0.1"); assertIsNewer("0.1.0", "0.1.1"); assertIsNewer("1.5.0", "1.6.0"); // assertIsNewer("1.6.0_12", "1.6.0_16"); // JDK version spec? } - + @Test public void testOlderVersion() { assertIsOlder("0.0.1", "0.0.0"); assertIsOlder("0.1.1", "0.1.0"); assertIsOlder("1.6.0", "1.5.0"); } + + @Test + public void testOlderOrEqualTo() + { + assertThat("9.2 <= 9.2",new Version("9.2").isOlderThanOrEqualTo(new Version("9.2")),is(true)); + assertThat("9.2 <= 9.3",new Version("9.2").isOlderThanOrEqualTo(new Version("9.3")),is(true)); + assertThat("9.3 <= 9.2",new Version("9.3").isOlderThanOrEqualTo(new Version("9.2")),is(false)); + } + + @Test + public void testNewerOrEqualTo() + { + assertThat("9.2 >= 9.2",new Version("9.2").isNewerThanOrEqualTo(new Version("9.2")),is(true)); + assertThat("9.2 >= 9.3",new Version("9.2").isNewerThanOrEqualTo(new Version("9.3")),is(false)); + assertThat("9.3 >= 9.2",new Version("9.3").isNewerThanOrEqualTo(new Version("9.2")),is(true)); + } private void assertIsOlder(String basever, String testver) { Version vbase = new Version(basever); Version vtest = new Version(testver); - assertTrue("Version [" + testver + "] should be older than [" + basever + "]", - vtest.compare(vbase) == -1); + assertTrue("Version [" + testver + "] should be older than [" + basever + "]", vtest.isOlderThan(vbase)); } private void assertIsNewer(String basever, String testver) { Version vbase = new Version(basever); Version vtest = new Version(testver); - assertTrue("Version [" + testver + "] should be newer than [" + basever + "]", - vtest.compare(vbase) == 1); + assertTrue("Version [" + testver + "] should be newer than [" + basever + "]", vtest.isNewerThan(vbase)); } } diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/util/RebuildTestResources.java b/jetty-start/src/test/java/org/eclipse/jetty/start/util/RebuildTestResources.java index 25f5fa0ebf..d20fae3780 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/util/RebuildTestResources.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/util/RebuildTestResources.java @@ -38,6 +38,8 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils; */ public class RebuildTestResources { + public static final String JETTY_VERSION = "9.3"; + public static void main(String[] args) { File realDistHome = MavenTestingUtils.getProjectDir("../jetty-distribution/target/distribution"); @@ -129,7 +131,7 @@ public class RebuildTestResources FS.ensureDirExists(libsDir.toFile()); PathMatcher matcher = getPathMatcher("glob:**.jar"); - Renamer renamer = new RegexRenamer("-9\\.[0-9.]*(v[0-9-]*)?(-SNAPSHOT)?(RC[0-9])?(M[0-9])?","-TEST"); + Renamer renamer = new RegexRenamer("-9\\.[0-9.]*(v[0-9-]*)?(-SNAPSHOT)?(RC[0-9])?(M[0-9])?","-" + JETTY_VERSION); FileCopier copier = new TouchFileCopier(); copyDir(srcDir.resolve("lib"),libsDir,matcher,renamer,copier); } 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 bbb4bcba76..bf92c388e2 100644 --- a/jetty-start/src/test/resources/assert-home-with-http2.txt +++ b/jetty-start/src/test/resources/assert-home-with-http2.txt @@ -3,6 +3,7 @@ XML|${jetty.base}/etc/home-base-warning.xml XML|${jetty.base}/etc/jetty.xml XML|${jetty.base}/etc/jetty-http.xml XML|${jetty.base}/etc/jetty-ssl.xml +XML|${jetty.base}/etc/jetty-ssl-context.xml XML|${jetty.base}/etc/jetty-alpn.xml XML|${jetty.base}/etc/jetty-deploy.xml XML|${jetty.base}/etc/jetty-http2.xml @@ -10,55 +11,49 @@ XML|${jetty.base}/etc/jetty-plus.xml XML|${jetty.base}/etc/jetty-annotations.xml # The LIBs we expect (order is irrelevant) -LIB|${jetty.base}/lib/apache-jsp/org.eclipse.jetty.apache-jsp-TEST.jar +LIB|${jetty.base}/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.3.jar LIB|${jetty.base}/lib/apache-jsp/org.eclipse.jetty.orbit.org.eclipse.jdt.core-3.8.2.v20130121.jar -LIB|${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.9.M3.jar -LIB|${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.9.M3.jar +LIB|${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.20.M0.jar +LIB|${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.20.M0.jar LIB|${jetty.base}/lib/apache-jstl/org.apache.taglibs.taglibs-standard-impl-1.2.1.jar LIB|${jetty.base}/lib/apache-jstl/org.apache.taglibs.taglibs-standard-spec-1.2.1.jar -LIB|${jetty.base}/lib/jetty-jndi-TEST.jar LIB|${jetty.base}/lib/jndi/javax.mail.glassfish-1.4.1.v201005082020.jar LIB|${jetty.base}/lib/jndi/javax.transaction-api-1.2.jar -LIB|${jetty.base}/lib/jetty-plus-TEST.jar -LIB|${jetty.base}/lib/jetty-annotations-TEST.jar LIB|${jetty.base}/lib/annotations/asm-5.0.1.jar LIB|${jetty.base}/lib/annotations/asm-commons-5.0.1.jar LIB|${jetty.base}/lib/annotations/javax.annotation-api-1.2.jar LIB|${jetty.base}/lib/websocket/javax.websocket-api-1.0.jar -LIB|${jetty.base}/lib/websocket/javax-websocket-client-impl-TEST.jar -LIB|${jetty.base}/lib/websocket/javax-websocket-server-impl-TEST.jar -LIB|${jetty.base}/lib/websocket/websocket-api-TEST.jar -LIB|${jetty.base}/lib/websocket/websocket-client-TEST.jar -LIB|${jetty.base}/lib/websocket/websocket-common-TEST.jar -LIB|${jetty.base}/lib/websocket/websocket-server-TEST.jar -LIB|${jetty.base}/lib/websocket/websocket-servlet-TEST.jar -LIB|${jetty.base}/lib/jetty-http-TEST.jar -LIB|${jetty.base}/lib/jetty-io-TEST.jar -LIB|${jetty.base}/lib/jetty-deploy-TEST.jar +LIB|${jetty.base}/lib/websocket/javax-websocket-client-impl-9.3.jar +LIB|${jetty.base}/lib/websocket/javax-websocket-server-impl-9.3.jar +LIB|${jetty.base}/lib/websocket/websocket-api-9.3.jar +LIB|${jetty.base}/lib/websocket/websocket-client-9.3.jar +LIB|${jetty.base}/lib/websocket/websocket-common-9.3.jar +LIB|${jetty.base}/lib/websocket/websocket-server-9.3.jar +LIB|${jetty.base}/lib/websocket/websocket-servlet-9.3.jar +LIB|${jetty.base}/lib/jetty-alpn-server-9.3.jar LIB|${jetty.base}/lib/jetty-schemas-3.1.jar -LIB|${jetty.base}/lib/jetty-security-TEST.jar -LIB|${jetty.base}/lib/jetty-server-TEST.jar -LIB|${jetty.base}/lib/jetty-servlet-TEST.jar -LIB|${jetty.base}/lib/jetty-util-TEST.jar -LIB|${jetty.base}/lib/jetty-webapp-TEST.jar -LIB|${jetty.base}/lib/jetty-xml-TEST.jar -LIB|${jetty.base}/lib/jetty-alpn-server-TEST.jar -LIB|${jetty.base}/lib/http2/http2-common-TEST.jar -LIB|${jetty.base}/lib/http2/http2-hpack-TEST.jar -LIB|${jetty.base}/lib/http2/http2-server-TEST.jar +LIB|${jetty.base}/lib/http2/http2-common-9.3.jar +LIB|${jetty.base}/lib/http2/http2-hpack-9.3.jar +LIB|${jetty.base}/lib/http2/http2-server-9.3.jar LIB|${jetty.base}/lib/servlet-api-3.1.jar +LIB|${jetty.base}/lib/jetty-annotations-9.3.jar +LIB|${jetty.base}/lib/jetty-http-9.3.jar +LIB|${jetty.base}/lib/jetty-io-9.3.jar +LIB|${jetty.base}/lib/jetty-deploy-9.3.jar +LIB|${jetty.base}/lib/jetty-plus-9.3.jar +LIB|${jetty.base}/lib/jetty-schemas-3.1.jar +LIB|${jetty.base}/lib/jetty-security-9.3.jar +LIB|${jetty.base}/lib/jetty-server-9.3.jar +LIB|${jetty.base}/lib/jetty-servlet-9.3.jar +LIB|${jetty.base}/lib/jetty-util-9.3.jar +LIB|${jetty.base}/lib/jetty-webapp-9.3.jar +LIB|${jetty.base}/lib/jetty-xml-9.3.jar +LIB|${jetty.base}/lib/jetty-jndi-9.3.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.sslContext.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g -# PROP|jetty.sslContext.keystorePath=etc/keystore -# PROP|jetty.sslContext.keystorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 -# PROP|jetty.httpConfig.securePort=8443 -# PROP|jetty.sslContext.truststorePath=etc/keystore -# PROP|jetty.sslContext.truststorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 -# PROP|jetty.ssl.port=8443 -# PROP|jetty.ssl.idleTimeout=30000 PROP|jetty.http.port=8080 PROP|jetty.httpConfig.delayDispatchUntilContent=false PROP|jetty.server.dumpAfterStart=false @@ -78,7 +73,7 @@ JVM|-Xmx1024m # Downloads DOWNLOAD|maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar -DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore +DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/test/config/etc/keystore?id=master|etc/keystore # Files FILE|lib/ 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 771f6da1be..871aa8d2f4 100644 --- a/jetty-start/src/test/resources/assert-home-with-jvm.txt +++ b/jetty-start/src/test/resources/assert-home-with-jvm.txt @@ -11,39 +11,41 @@ XML|${jetty.base}/etc/jetty-logging.xml # The LIBs we expect (order is irrelevant) LIB|${maven-test-resources}/extra-resources LIB|${maven-test-resources}/extra-libs/example.jar -LIB|${jetty.base}/lib/apache-jsp/org.eclipse.jetty.apache-jsp-TEST.jar +LIB|${jetty.base}/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.3.jar LIB|${jetty.base}/lib/apache-jsp/org.eclipse.jetty.orbit.org.eclipse.jdt.core-3.8.2.v20130121.jar -LIB|${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.9.M3.jar -LIB|${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.9.M3.jar +LIB|${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.20.M0.jar +LIB|${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.20.M0.jar LIB|${jetty.base}/lib/apache-jstl/org.apache.taglibs.taglibs-standard-impl-1.2.1.jar LIB|${jetty.base}/lib/apache-jstl/org.apache.taglibs.taglibs-standard-spec-1.2.1.jar LIB|${jetty.base}/lib/servlet-api-3.1.jar LIB|${jetty.base}/lib/jetty-schemas-3.1.jar -LIB|${jetty.base}/lib/jetty-http-TEST.jar -LIB|${jetty.base}/lib/jetty-server-TEST.jar -LIB|${jetty.base}/lib/jetty-xml-TEST.jar -LIB|${jetty.base}/lib/jetty-util-TEST.jar -LIB|${jetty.base}/lib/jetty-io-TEST.jar -LIB|${jetty.base}/lib/jetty-jndi-TEST.jar LIB|${jetty.base}/lib/jndi/javax.mail.glassfish-1.4.1.v201005082020.jar LIB|${jetty.base}/lib/jndi/javax.transaction-api-1.2.jar -LIB|${jetty.base}/lib/jetty-security-TEST.jar -LIB|${jetty.base}/lib/jetty-servlet-TEST.jar -LIB|${jetty.base}/lib/jetty-webapp-TEST.jar -LIB|${jetty.base}/lib/jetty-deploy-TEST.jar -LIB|${jetty.base}/lib/jetty-plus-TEST.jar -LIB|${jetty.base}/lib/jetty-annotations-TEST.jar LIB|${jetty.base}/lib/annotations/asm-5.0.1.jar LIB|${jetty.base}/lib/annotations/asm-commons-5.0.1.jar LIB|${jetty.base}/lib/annotations/javax.annotation-api-1.2.jar LIB|${jetty.base}/lib/websocket/javax.websocket-api-1.0.jar -LIB|${jetty.base}/lib/websocket/javax-websocket-client-impl-TEST.jar -LIB|${jetty.base}/lib/websocket/javax-websocket-server-impl-TEST.jar -LIB|${jetty.base}/lib/websocket/websocket-api-TEST.jar -LIB|${jetty.base}/lib/websocket/websocket-client-TEST.jar -LIB|${jetty.base}/lib/websocket/websocket-common-TEST.jar -LIB|${jetty.base}/lib/websocket/websocket-server-TEST.jar -LIB|${jetty.base}/lib/websocket/websocket-servlet-TEST.jar +LIB|${jetty.base}/lib/websocket/javax-websocket-client-impl-9.3.jar +LIB|${jetty.base}/lib/websocket/javax-websocket-server-impl-9.3.jar +LIB|${jetty.base}/lib/websocket/websocket-api-9.3.jar +LIB|${jetty.base}/lib/websocket/websocket-client-9.3.jar +LIB|${jetty.base}/lib/websocket/websocket-common-9.3.jar +LIB|${jetty.base}/lib/websocket/websocket-server-9.3.jar +LIB|${jetty.base}/lib/websocket/websocket-servlet-9.3.jar +LIB|${jetty.base}/lib/jetty-annotations-9.3.jar +LIB|${jetty.base}/lib/jetty-http-9.3.jar +LIB|${jetty.base}/lib/jetty-io-9.3.jar +LIB|${jetty.base}/lib/jetty-deploy-9.3.jar +LIB|${jetty.base}/lib/jetty-plus-9.3.jar +LIB|${jetty.base}/lib/jetty-schemas-3.1.jar +LIB|${jetty.base}/lib/jetty-security-9.3.jar +LIB|${jetty.base}/lib/jetty-server-9.3.jar +LIB|${jetty.base}/lib/jetty-servlet-9.3.jar +LIB|${jetty.base}/lib/jetty-util-9.3.jar +LIB|${jetty.base}/lib/jetty-webapp-9.3.jar +LIB|${jetty.base}/lib/jetty-xml-9.3.jar +LIB|${jetty.base}/lib/jetty-jndi-9.3.jar + # The Properties we expect (order is irrelevant) # (these are the properties we actually set in the configuration) diff --git a/jetty-start/src/test/resources/assert-home.txt b/jetty-start/src/test/resources/assert-home.txt index aab1bae2e9..70515e30a7 100644 --- a/jetty-start/src/test/resources/assert-home.txt +++ b/jetty-start/src/test/resources/assert-home.txt @@ -7,43 +7,43 @@ XML|${jetty.base}/etc/jetty-plus.xml XML|${jetty.base}/etc/jetty-annotations.xml # The LIBs we expect (order is irrelevant) -LIB|${jetty.base}/lib/apache-jsp/org.eclipse.jetty.apache-jsp-TEST.jar +LIB|${jetty.base}/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.3.jar LIB|${jetty.base}/lib/apache-jsp/org.eclipse.jetty.orbit.org.eclipse.jdt.core-3.8.2.v20130121.jar -LIB|${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.9.M3.jar -LIB|${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.9.M3.jar +LIB|${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.20.M0.jar +LIB|${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.20.M0.jar LIB|${jetty.base}/lib/apache-jstl/org.apache.taglibs.taglibs-standard-impl-1.2.1.jar LIB|${jetty.base}/lib/apache-jstl/org.apache.taglibs.taglibs-standard-spec-1.2.1.jar LIB|${jetty.base}/lib/annotations/asm-5.0.1.jar LIB|${jetty.base}/lib/annotations/asm-commons-5.0.1.jar LIB|${jetty.base}/lib/annotations/javax.annotation-api-1.2.jar -LIB|${jetty.base}/lib/jetty-jndi-TEST.jar +LIB|${jetty.base}/lib/jetty-jndi-9.3.jar LIB|${jetty.base}/lib/jndi/javax.mail.glassfish-1.4.1.v201005082020.jar LIB|${jetty.base}/lib/jndi/javax.transaction-api-1.2.jar -LIB|${jetty.base}/lib/jetty-annotations-TEST.jar -LIB|${jetty.base}/lib/jetty-http-TEST.jar -LIB|${jetty.base}/lib/jetty-io-TEST.jar -LIB|${jetty.base}/lib/jetty-deploy-TEST.jar -LIB|${jetty.base}/lib/jetty-plus-TEST.jar +LIB|${jetty.base}/lib/jetty-annotations-9.3.jar +LIB|${jetty.base}/lib/jetty-http-9.3.jar +LIB|${jetty.base}/lib/jetty-io-9.3.jar +LIB|${jetty.base}/lib/jetty-deploy-9.3.jar +LIB|${jetty.base}/lib/jetty-plus-9.3.jar LIB|${jetty.base}/lib/jetty-schemas-3.1.jar -LIB|${jetty.base}/lib/jetty-security-TEST.jar -LIB|${jetty.base}/lib/jetty-server-TEST.jar -LIB|${jetty.base}/lib/jetty-servlet-TEST.jar -LIB|${jetty.base}/lib/jetty-util-TEST.jar -LIB|${jetty.base}/lib/jetty-webapp-TEST.jar -LIB|${jetty.base}/lib/jetty-xml-TEST.jar +LIB|${jetty.base}/lib/jetty-security-9.3.jar +LIB|${jetty.base}/lib/jetty-server-9.3.jar +LIB|${jetty.base}/lib/jetty-servlet-9.3.jar +LIB|${jetty.base}/lib/jetty-util-9.3.jar +LIB|${jetty.base}/lib/jetty-webapp-9.3.jar +LIB|${jetty.base}/lib/jetty-xml-9.3.jar LIB|${jetty.base}/lib/servlet-api-3.1.jar LIB|${jetty.base}/lib/websocket/javax.websocket-api-1.0.jar -LIB|${jetty.base}/lib/websocket/javax-websocket-client-impl-TEST.jar -LIB|${jetty.base}/lib/websocket/javax-websocket-server-impl-TEST.jar -LIB|${jetty.base}/lib/websocket/websocket-api-TEST.jar -LIB|${jetty.base}/lib/websocket/websocket-client-TEST.jar -LIB|${jetty.base}/lib/websocket/websocket-common-TEST.jar -LIB|${jetty.base}/lib/websocket/websocket-server-TEST.jar -LIB|${jetty.base}/lib/websocket/websocket-servlet-TEST.jar +LIB|${jetty.base}/lib/websocket/javax-websocket-client-impl-9.3.jar +LIB|${jetty.base}/lib/websocket/javax-websocket-server-impl-9.3.jar +LIB|${jetty.base}/lib/websocket/websocket-api-9.3.jar +LIB|${jetty.base}/lib/websocket/websocket-client-9.3.jar +LIB|${jetty.base}/lib/websocket/websocket-common-9.3.jar +LIB|${jetty.base}/lib/websocket/websocket-server-9.3.jar +LIB|${jetty.base}/lib/websocket/websocket-servlet-9.3.jar # The Properties we expect (order is irrelevant) # (these are the properties we actually set in the configuration) -PROP|jetty.http.port=9090 +PROP|jetty.http.port=8080 # (these are the ones set by default from jetty.home modules) PROP|jetty.httpConfig.delayDispatchUntilContent=false PROP|jetty.server.dumpAfterStart=false diff --git a/jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.eclipse.jetty.apache-jsp-TEST.jar b/jetty-start/src/test/resources/dist-home/etc/jetty-infinispan.xml index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.eclipse.jetty.apache-jsp-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/etc/jetty-infinispan.xml diff --git a/jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.9.M3.jar b/jetty-start/src/test/resources/dist-home/etc/jetty-jdbc-sessions.xml index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.9.M3.jar +++ b/jetty-start/src/test/resources/dist-home/etc/jetty-jdbc-sessions.xml diff --git a/jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.9.M3.jar b/jetty-start/src/test/resources/dist-home/etc/jetty-nosql.xml index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.9.M3.jar +++ b/jetty-start/src/test/resources/dist-home/etc/jetty-nosql.xml diff --git a/jetty-start/src/test/resources/dist-home/lib/fcgi/fcgi-client-TEST.jar b/jetty-start/src/test/resources/dist-home/etc/jetty-ssl-context.xml index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/fcgi/fcgi-client-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/etc/jetty-ssl-context.xml diff --git a/jetty-start/src/test/resources/dist-home/etc/webdefault.xml b/jetty-start/src/test/resources/dist-home/etc/webdefault.xml index d54d76f307..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/etc/webdefault.xml +++ b/jetty-start/src/test/resources/dist-home/etc/webdefault.xml @@ -1,534 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app - xmlns="http://xmlns.jcp.org/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" - metadata-complete="false" - version="3.1"> - - <!-- ===================================================================== --> - <!-- This file contains the default descriptor for web applications. --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- The intent of this descriptor is to include jetty specific or common --> - <!-- configuration for all webapps. If a context has a webdefault.xml --> - <!-- descriptor, it is applied before the context's own web.xml file --> - <!-- --> - <!-- A context may be assigned a default descriptor by calling --> - <!-- WebAppContext.setDefaultsDescriptor(String). --> - <!-- --> - <!-- This file is present in the jetty-webapp.jar, and is used as the --> - <!-- defaults descriptor if no other is explicitly set on a context. --> - <!-- --> - <!-- A copy of this file is also placed into the $JETTY_HOME/etc dir of --> - <!-- the distribution, and is referenced by some of the other xml files, --> - <!-- eg the jetty-deploy.xml file. --> - <!-- ===================================================================== --> - - <description> - Default web.xml file. - This file is applied to a Web application before it's own WEB_INF/web.xml file - </description> - - <!-- ==================================================================== --> - <!-- Removes static references to beans from javax.el.BeanELResolver to --> - <!-- ensure webapp classloader can be released on undeploy --> - <!-- ==================================================================== --> - <listener> - <listener-class>org.eclipse.jetty.servlet.listener.ELContextCleaner</listener-class> - </listener> - - <!-- ==================================================================== --> - <!-- Removes static cache of Methods from java.beans.Introspector to --> - <!-- ensure webapp classloader can be released on undeploy --> - <!-- ==================================================================== --> - <listener> - <listener-class>org.eclipse.jetty.servlet.listener.IntrospectorCleaner</listener-class> - </listener> - - - <!-- ==================================================================== --> - <!-- Context params to control Session Cookies --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- - UNCOMMENT TO ACTIVATE - <context-param> - <param-name>org.eclipse.jetty.servlet.SessionDomain</param-name> - <param-value>127.0.0.1</param-value> - </context-param> - <context-param> - <param-name>org.eclipse.jetty.servlet.SessionPath</param-name> - <param-value>/</param-value> - </context-param> - <context-param> - <param-name>org.eclipse.jetty.servlet.MaxAge</param-name> - <param-value>-1</param-value> - </context-param> - --> - - <!-- ==================================================================== --> - <!-- The default servlet. --> - <!-- This servlet, normally mapped to /, provides the handling for static --> - <!-- content, OPTIONS and TRACE methods for the context. --> - <!-- The following initParameters are supported: --> - <!-- - * acceptRanges If true, range requests and responses are - * supported - * - * dirAllowed If true, directory listings are returned if no - * welcome file is found. Else 403 Forbidden. - * - * welcomeServlets If true, attempt to dispatch to welcome files - * that are servlets, but only after no matching static - * resources could be found. If false, then a welcome - * file must exist on disk. If "exact", then exact - * servlet matches are supported without an existing file. - * Default is true. - * - * This must be false if you want directory listings, - * but have index.jsp in your welcome file list. - * - * redirectWelcome If true, welcome files are redirected rather than - * forwarded to. - * - * gzip If set to true, then static content will be served as - * gzip content encoded if a matching resource is - * found ending with ".gz" - * - * resourceBase Set to replace the context resource base - * - * resourceCache If set, this is a context attribute name, which the servlet - * will use to look for a shared ResourceCache instance. - * - * relativeResourceBase - * Set with a pathname relative to the base of the - * servlet context root. Useful for only serving static content out - * of only specific subdirectories. - * - * pathInfoOnly If true, only the path info will be applied to the resourceBase - * - * stylesheet Set with the location of an optional stylesheet that will be used - * to decorate the directory listing html. - * - * aliases If True, aliases of resources are allowed (eg. symbolic - * links and caps variations). May bypass security constraints. - * - * etags If True, weak etags will be generated and handled. - * - * maxCacheSize The maximum total size of the cache or 0 for no cache. - * maxCachedFileSize The maximum size of a file to cache - * maxCachedFiles The maximum number of files to cache - * - * useFileMappedBuffer - * If set to true, it will use mapped file buffers to serve static content - * when using an NIO connector. Setting this value to false means that - * a direct buffer will be used instead of a mapped file buffer. - * This file sets the value to true. - * - * cacheControl If set, all static content will have this value set as the cache-control - * header. - * - --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <servlet> - <servlet-name>default</servlet-name> - <servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class> - <init-param> - <param-name>aliases</param-name> - <param-value>false</param-value> - </init-param> - <init-param> - <param-name>acceptRanges</param-name> - <param-value>true</param-value> - </init-param> - <init-param> - <param-name>dirAllowed</param-name> - <param-value>true</param-value> - </init-param> - <init-param> - <param-name>welcomeServlets</param-name> - <param-value>false</param-value> - </init-param> - <init-param> - <param-name>redirectWelcome</param-name> - <param-value>false</param-value> - </init-param> - <init-param> - <param-name>maxCacheSize</param-name> - <param-value>256000000</param-value> - </init-param> - <init-param> - <param-name>maxCachedFileSize</param-name> - <param-value>200000000</param-value> - </init-param> - <init-param> - <param-name>maxCachedFiles</param-name> - <param-value>2048</param-value> - </init-param> - <init-param> - <param-name>gzip</param-name> - <param-value>false</param-value> - </init-param> - <init-param> - <param-name>etags</param-name> - <param-value>false</param-value> - </init-param> - <init-param> - <param-name>useFileMappedBuffer</param-name> - <param-value>true</param-value> - </init-param> - <!-- - <init-param> - <param-name>resourceCache</param-name> - <param-value>resourceCache</param-value> - </init-param> - --> - <!-- - <init-param> - <param-name>cacheControl</param-name> - <param-value>max-age=3600,public</param-value> - </init-param> - --> - <load-on-startup>0</load-on-startup> - </servlet> - - <servlet-mapping> - <servlet-name>default</servlet-name> - <url-pattern>/</url-pattern> - </servlet-mapping> - - - <!-- ==================================================================== --> - <!-- JSP Servlet --> - <!-- This is the jasper JSP servlet. --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- The JSP page compiler and execution servlet, which is the mechanism --> - <!-- used by the jsp container to support JSP pages. Traditionally, --> - <!-- this servlet is mapped to URL pattern "*.jsp". This servlet --> - <!-- supports the following initialization parameters (default values --> - <!-- are in square brackets): --> - <!-- --> - <!-- checkInterval If development is false and reloading is true, --> - <!-- background compiles are enabled. checkInterval --> - <!-- is the time in seconds between checks to see --> - <!-- if a JSP page needs to be recompiled. [300] --> - <!-- --> - <!-- compiler Which compiler Ant should use to compile JSP --> - <!-- pages. See the Ant documentation for more --> - <!-- information. [javac] --> - <!-- --> - <!-- classdebuginfo Should the class file be compiled with --> - <!-- debugging information? [true] --> - <!-- --> - <!-- classpath What class path should I use while compiling --> - <!-- generated servlets? [Created dynamically --> - <!-- based on the current web application] --> - <!-- Set to ? to make the container explicitly set --> - <!-- this parameter. --> - <!-- --> - <!-- development Is Jasper used in development mode (will check --> - <!-- for JSP modification on every access)? [true] --> - <!-- --> - <!-- enablePooling Determines whether tag handler pooling is --> - <!-- enabled [true] --> - <!-- --> - <!-- fork Tell Ant to fork compiles of JSP pages so that --> - <!-- a separate JVM is used for JSP page compiles --> - <!-- from the one Tomcat is running in. [true] --> - <!-- --> - <!-- ieClassId The class-id value to be sent to Internet --> - <!-- Explorer when using <jsp:plugin> tags. --> - <!-- [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93] --> - <!-- --> - <!-- javaEncoding Java file encoding to use for generating java --> - <!-- source files. [UTF-8] --> - <!-- --> - <!-- keepgenerated Should we keep the generated Java source code --> - <!-- for each page instead of deleting it? [true] --> - <!-- --> - <!-- logVerbosityLevel The level of detailed messages to be produced --> - <!-- by this servlet. Increasing levels cause the --> - <!-- generation of more messages. Valid values are --> - <!-- FATAL, ERROR, WARNING, INFORMATION, and DEBUG. --> - <!-- [WARNING] --> - <!-- --> - <!-- mappedfile Should we generate static content with one --> - <!-- print statement per input line, to ease --> - <!-- debugging? [false] --> - <!-- --> - <!-- --> - <!-- reloading Should Jasper check for modified JSPs? [true] --> - <!-- --> - <!-- suppressSmap Should the generation of SMAP info for JSR45 --> - <!-- debugging be suppressed? [false] --> - <!-- --> - <!-- dumpSmap Should the SMAP info for JSR45 debugging be --> - <!-- dumped to a file? [false] --> - <!-- False if suppressSmap is true --> - <!-- --> - <!-- scratchdir What scratch directory should we use when --> - <!-- compiling JSP pages? [default work directory --> - <!-- for the current web application] --> - <!-- --> - <!-- tagpoolMaxSize The maximum tag handler pool size [5] --> - <!-- --> - <!-- xpoweredBy Determines whether X-Powered-By response --> - <!-- header is added by generated servlet [false] --> - <!-- --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <servlet id="jsp"> - <servlet-name>jsp</servlet-name> - <servlet-class>org.eclipse.jetty.jsp.JettyJspServlet</servlet-class> - <init-param> - <param-name>logVerbosityLevel</param-name> - <param-value>DEBUG</param-value> - </init-param> - <init-param> - <param-name>fork</param-name> - <param-value>false</param-value> - </init-param> - <init-param> - <param-name>xpoweredBy</param-name> - <param-value>false</param-value> - </init-param> - <init-param> - <param-name>compilerTargetVM</param-name> - <param-value>1.7</param-value> - </init-param> - <init-param> - <param-name>compilerSourceVM</param-name> - <param-value>1.7</param-value> - </init-param> - <!-- - <init-param> - <param-name>classpath</param-name> - <param-value>?</param-value> - </init-param> - --> - <load-on-startup>0</load-on-startup> - </servlet> - - <servlet-mapping> - <servlet-name>jsp</servlet-name> - <url-pattern>*.jsp</url-pattern> - <url-pattern>*.jspf</url-pattern> - <url-pattern>*.jspx</url-pattern> - <url-pattern>*.xsp</url-pattern> - <url-pattern>*.JSP</url-pattern> - <url-pattern>*.JSPF</url-pattern> - <url-pattern>*.JSPX</url-pattern> - <url-pattern>*.XSP</url-pattern> - </servlet-mapping> - - - <!-- ==================================================================== --> - <!-- Default session configuration --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <session-config> - <session-timeout>30</session-timeout> - </session-config> - - <!-- ==================================================================== --> - <!-- Default MIME mappings --> - <!-- The default MIME mappings are provided by the mime.properties --> - <!-- resource in the jetty-http.jar file. Additional or modified --> - <!-- mappings may be specified here --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- UNCOMMENT TO ACTIVATE - <mime-mapping> - <extension>mysuffix</extension> - <mime-type>mymime/type</mime-type> - </mime-mapping> - --> - - <!-- ==================================================================== --> - <!-- Default welcome files --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <welcome-file-list> - <welcome-file>index.html</welcome-file> - <welcome-file>index.htm</welcome-file> - <welcome-file>index.jsp</welcome-file> - </welcome-file-list> - - <!-- ==================================================================== --> - <!-- Default locale encodings --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <locale-encoding-mapping-list> - <locale-encoding-mapping> - <locale>ar</locale> - <encoding>ISO-8859-6</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>be</locale> - <encoding>ISO-8859-5</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>bg</locale> - <encoding>ISO-8859-5</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>ca</locale> - <encoding>ISO-8859-1</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>cs</locale> - <encoding>ISO-8859-2</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>da</locale> - <encoding>ISO-8859-1</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>de</locale> - <encoding>ISO-8859-1</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>el</locale> - <encoding>ISO-8859-7</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>en</locale> - <encoding>ISO-8859-1</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>es</locale> - <encoding>ISO-8859-1</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>et</locale> - <encoding>ISO-8859-1</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>fi</locale> - <encoding>ISO-8859-1</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>fr</locale> - <encoding>ISO-8859-1</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>hr</locale> - <encoding>ISO-8859-2</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>hu</locale> - <encoding>ISO-8859-2</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>is</locale> - <encoding>ISO-8859-1</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>it</locale> - <encoding>ISO-8859-1</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>iw</locale> - <encoding>ISO-8859-8</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>ja</locale> - <encoding>Shift_JIS</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>ko</locale> - <encoding>EUC-KR</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>lt</locale> - <encoding>ISO-8859-2</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>lv</locale> - <encoding>ISO-8859-2</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>mk</locale> - <encoding>ISO-8859-5</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>nl</locale> - <encoding>ISO-8859-1</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>no</locale> - <encoding>ISO-8859-1</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>pl</locale> - <encoding>ISO-8859-2</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>pt</locale> - <encoding>ISO-8859-1</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>ro</locale> - <encoding>ISO-8859-2</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>ru</locale> - <encoding>ISO-8859-5</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>sh</locale> - <encoding>ISO-8859-5</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>sk</locale> - <encoding>ISO-8859-2</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>sl</locale> - <encoding>ISO-8859-2</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>sq</locale> - <encoding>ISO-8859-2</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>sr</locale> - <encoding>ISO-8859-5</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>sv</locale> - <encoding>ISO-8859-1</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>tr</locale> - <encoding>ISO-8859-9</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>uk</locale> - <encoding>ISO-8859-5</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>zh</locale> - <encoding>GB2312</encoding> - </locale-encoding-mapping> - <locale-encoding-mapping> - <locale>zh_TW</locale> - <encoding>Big5</encoding> - </locale-encoding-mapping> - </locale-encoding-mapping-list> - - <!-- ==================================================================== --> - <!-- Disable TRACE method with security constraint --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <security-constraint> - <web-resource-collection> - <web-resource-name>Disable TRACE</web-resource-name> - <url-pattern>/</url-pattern> - <http-method>TRACE</http-method> - </web-resource-collection> - <auth-constraint/> - </security-constraint> - <security-constraint> - <web-resource-collection> - <web-resource-name>Enable everything but TRACE</web-resource-name> - <url-pattern>/</url-pattern> - <http-method-omission>TRACE</http-method-omission> - </web-resource-collection> - </security-constraint> - -</web-app> - diff --git a/jetty-start/src/test/resources/dist-home/lib/fcgi/fcgi-server-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/fcgi/fcgi-server-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/http2/http2-common-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.20.M0.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/http2/http2-common-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.20.M0.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/http2/http2-hpack-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.20.M0.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/http2/http2-hpack-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.20.M0.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/http2/http2-server-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/cdi-core-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/http2/http2-server-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/cdi-core-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-alpn-server-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/cdi-servlet-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-alpn-server-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/cdi-servlet-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-annotations-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/cdi-websocket-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-annotations-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/cdi-websocket-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-cdi-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/fcgi/fcgi-client-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-cdi-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/fcgi/fcgi-client-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-client-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/fcgi/fcgi-server-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-client-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/fcgi/fcgi-server-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-continuation-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/http2/http2-common-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-continuation-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/http2/http2-common-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-deploy-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/http2/http2-hpack-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-deploy-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/http2/http2-hpack-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-http-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/http2/http2-server-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-http-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/http2/http2-server-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-io-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-alpn-server-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-io-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-alpn-server-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-jaas-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-annotations-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-jaas-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-annotations-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-jaspi-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-client-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-jaspi-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-client-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-jmx-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-continuation-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-jmx-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-continuation-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-jndi-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-deploy-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-jndi-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-deploy-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-plus-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-http-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-plus-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-http-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-proxy-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-infinispan-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-proxy-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-infinispan-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-quickstart-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-io-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-quickstart-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-io-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-rewrite-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-jaas-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-rewrite-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-jaas-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-security-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-jaspi-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-security-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-jaspi-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-server-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-jmx-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-server-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-jmx-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-servlet-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-jndi-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-servlet-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-jndi-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-servlets-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-nosql-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-servlets-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-nosql-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-util-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-plus-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-util-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-plus-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-webapp-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-proxy-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-webapp-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-proxy-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/jetty-xml-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-quickstart-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/jetty-xml-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-quickstart-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/monitor/jetty-monitor-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-rewrite-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/monitor/jetty-monitor-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-rewrite-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/setuid/jetty-setuid-java-1.0.1.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-security-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/setuid/jetty-setuid-java-1.0.1.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-security-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/spring/jetty-spring-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-server-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/spring/jetty-spring-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-server-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/websocket/javax-websocket-client-impl-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-servlet-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/websocket/javax-websocket-client-impl-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-servlet-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/websocket/javax-websocket-server-impl-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-servlets-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/websocket/javax-websocket-server-impl-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-servlets-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-api-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-util-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-api-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-util-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-client-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-webapp-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-client-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-webapp-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-common-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/jetty-xml-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-common-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/jetty-xml-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-server-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/monitor/jetty-monitor-9.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-server-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/monitor/jetty-monitor-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-servlet-TEST.jar b/jetty-start/src/test/resources/dist-home/lib/setuid/jetty-setuid-java-1.0.3.jar index e69de29bb2..e69de29bb2 100644 --- a/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-servlet-TEST.jar +++ b/jetty-start/src/test/resources/dist-home/lib/setuid/jetty-setuid-java-1.0.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/spring/jetty-spring-9.3.jar b/jetty-start/src/test/resources/dist-home/lib/spring/jetty-spring-9.3.jar new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/lib/spring/jetty-spring-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/websocket/javax-websocket-client-impl-9.3.jar b/jetty-start/src/test/resources/dist-home/lib/websocket/javax-websocket-client-impl-9.3.jar new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/lib/websocket/javax-websocket-client-impl-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/websocket/javax-websocket-server-impl-9.3.jar b/jetty-start/src/test/resources/dist-home/lib/websocket/javax-websocket-server-impl-9.3.jar new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/lib/websocket/javax-websocket-server-impl-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-api-9.3.jar b/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-api-9.3.jar new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-api-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-client-9.3.jar b/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-client-9.3.jar new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-client-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-common-9.3.jar b/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-common-9.3.jar new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-common-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-server-9.3.jar b/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-server-9.3.jar new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-server-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-servlet-9.3.jar b/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-servlet-9.3.jar new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/lib/websocket/websocket-servlet-9.3.jar diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod index a1002a48cc..1e677eef4d 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] alpn-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod index a1002a48cc..1e677eef4d 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] alpn-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod index a1002a48cc..1e677eef4d 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] alpn-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod index a1002a48cc..1e677eef4d 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] alpn-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod index a1002a48cc..1e677eef4d 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] alpn-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod index a1002a48cc..1e677eef4d 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] alpn-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod index a1002a48cc..1e677eef4d 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] alpn-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod index a554324494..796c3cf0ec 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] alpn-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod index a554324494..796c3cf0ec 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] alpn-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod index 3f6f912c6d..86a2608896 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] alpn-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod index 3f6f912c6d..86a2608896 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] alpn-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_79.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_79.mod index ac315d6df7..0a96751397 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_79.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_79.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] protonego-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_80.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_80.mod index ac315d6df7..0a96751397 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_80.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_80.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] protonego-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0.mod index cb91b4c2fd..975761c779 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] alpn-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_05.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_05.mod index cb91b4c2fd..975761c779 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_05.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_05.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] alpn-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_11.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_11.mod index cb91b4c2fd..975761c779 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_11.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_11.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] alpn-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_20.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_20.mod index cb91b4c2fd..975761c779 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_20.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_20.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] alpn-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_25.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_25.mod index 6d6d75efa4..11a9c0e9d8 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_25.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_25.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] alpn-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_31.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_31.mod index e52bd23c1c..11bad4792c 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_31.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_31.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] alpn-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_40.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_40.mod index 4114979319..ad3a02f7dc 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_40.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_40.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] protonego-boot diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_45.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_45.mod index 4114979319..ad3a02f7dc 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_45.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_45.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [name] protonego-boot 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 41a6f295d3..a7d084d654 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn.mod @@ -16,6 +16,9 @@ # All versions of alpn-boot can be found at # http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/ +[version] +9.3 + [name] alpn @@ -44,7 +47,7 @@ lib/alpn/ # jetty.alpn.defaultProtocol=http/1.1 # ALPN debug logging on System.err -jetty.alpn.debug=false +# jetty.alpn.debug=false [license] ALPN is a hosted at github under the GPL v2 with ClassPath Exception. diff --git a/jetty-start/src/test/resources/dist-home/modules/annotations.mod b/jetty-start/src/test/resources/dist-home/modules/annotations.mod index 65e4654127..25488f48ac 100644 --- a/jetty-start/src/test/resources/dist-home/modules/annotations.mod +++ b/jetty-start/src/test/resources/dist-home/modules/annotations.mod @@ -2,6 +2,9 @@ # Jetty Annotation Scanning Module # +[version] +9.3 + [depend] # Annotations needs plus, and jndi features plus diff --git a/jetty-start/src/test/resources/dist-home/modules/apache-jsp.mod b/jetty-start/src/test/resources/dist-home/modules/apache-jsp.mod index 5123670cb0..8d5e1b6359 100644 --- a/jetty-start/src/test/resources/dist-home/modules/apache-jsp.mod +++ b/jetty-start/src/test/resources/dist-home/modules/apache-jsp.mod @@ -2,6 +2,9 @@ # Apache JSP Module # +[version] +9.3 + [name] apache-jsp diff --git a/jetty-start/src/test/resources/dist-home/modules/apache-jstl.mod b/jetty-start/src/test/resources/dist-home/modules/apache-jstl.mod index 5d607520df..ed7104c4ce 100644 --- a/jetty-start/src/test/resources/dist-home/modules/apache-jstl.mod +++ b/jetty-start/src/test/resources/dist-home/modules/apache-jstl.mod @@ -1,6 +1,10 @@ # # Apache JSTL # + +[version] +9.3 + [name] apache-jstl diff --git a/jetty-start/src/test/resources/dist-home/modules/cdi.mod b/jetty-start/src/test/resources/dist-home/modules/cdi.mod index cde3090e0c..0c09808ac9 100644 --- a/jetty-start/src/test/resources/dist-home/modules/cdi.mod +++ b/jetty-start/src/test/resources/dist-home/modules/cdi.mod @@ -2,6 +2,9 @@ # CDI / Weld Jetty module # +[version] +9.3 + [depend] deploy annotations @@ -10,12 +13,24 @@ plus jsp [files] -lib/weld/ -maven://org.jboss.weld.servlet/weld-servlet/2.2.5.Final|lib/weld/weld-servlet-2.2.5.Final.jar +lib/cdi/ +maven://javax.enterprise/cdi-api/1.2|lib/cdi/javax.enterprise.cdi-api-1.2.jar +maven://javax.interceptor/javax.interceptor-api/1.2|lib/cdi/javax.interceptor-api-1.2.jar +maven://javax.inject/javax.inject/1|lib/cdi/javax.inject-1.0.jar +maven://org.jboss.weld.servlet/weld-servlet-core/2.2.9.Final|lib/cdi/weld-servlet-core-2.2.9.Final.jar +maven://org.jboss.weld.environment/weld-environment-common/2.2.9.Final|lib/cdi/weld-environment-common-2.2.9.Final.jar +maven://org.jboss.weld/weld-core-impl/2.2.9.Final|lib/cdi/weld-core-impl-2.2.9.Final.jar +maven://org.jboss.classfilewriter/jboss-classfilewriter/1.0.5.Final|lib/cdi/jboss-classfilewriter-1.0.5.Final.jar +maven://com.google.guava/guava/13.0.1|lib/cdi/com.google.guava.guava-13.0.1.jar +maven://org.jboss.weld/weld-spi/2.2.SP3|lib/cdi/weld-spi-2.2.SP3.jar +maven://org.jboss.weld/weld-api/2.2.SP3|lib/cdi/weld-api-2.2.SP3.jar +maven://org.jboss.logging/jboss-logging/3.1.3.GA|lib/cdi/jboss-logging-3.1.3.GA.jar + [lib] -lib/weld/weld-servlet-2.2.5.Final.jar -lib/jetty-cdi-${jetty.version}.jar +lib/cdi/*.jar +lib/cdi-core-${jetty.version}.jar +lib/cdi-servlet-${jetty.version}.jar [xml] etc/jetty-cdi.xml diff --git a/jetty-start/src/test/resources/dist-home/modules/client.mod b/jetty-start/src/test/resources/dist-home/modules/client.mod index 39b58d4e69..fd0529e51b 100644 --- a/jetty-start/src/test/resources/dist-home/modules/client.mod +++ b/jetty-start/src/test/resources/dist-home/modules/client.mod @@ -2,5 +2,8 @@ # Client Feature # +[version] +9.3 + [lib] lib/jetty-client-${jetty.version}.jar diff --git a/jetty-start/src/test/resources/dist-home/modules/continuation.mod b/jetty-start/src/test/resources/dist-home/modules/continuation.mod index 231c09d0f3..48241fcfbf 100644 --- a/jetty-start/src/test/resources/dist-home/modules/continuation.mod +++ b/jetty-start/src/test/resources/dist-home/modules/continuation.mod @@ -2,5 +2,8 @@ # Classic Jetty Continuation Support Module # +[version] +9.3 + [lib] lib/jetty-continuation-${jetty.version}.jar diff --git a/jetty-start/src/test/resources/dist-home/modules/debuglog.mod b/jetty-start/src/test/resources/dist-home/modules/debuglog.mod index ba8b60a727..175523aa40 100644 --- a/jetty-start/src/test/resources/dist-home/modules/debuglog.mod +++ b/jetty-start/src/test/resources/dist-home/modules/debuglog.mod @@ -2,6 +2,9 @@ # Debug module # +[version] +9.3 + [depend] server 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 f567a2090f..ad62936a10 100644 --- a/jetty-start/src/test/resources/dist-home/modules/deploy.mod +++ b/jetty-start/src/test/resources/dist-home/modules/deploy.mod @@ -2,6 +2,9 @@ # Deploy Feature # +[version] +9.3 + [depend] webapp diff --git a/jetty-start/src/test/resources/dist-home/modules/ext.mod b/jetty-start/src/test/resources/dist-home/modules/ext.mod index 56b10f7ea4..defe073e62 100644 --- a/jetty-start/src/test/resources/dist-home/modules/ext.mod +++ b/jetty-start/src/test/resources/dist-home/modules/ext.mod @@ -2,6 +2,9 @@ # Module to add all lib/ext/**.jar files to classpath # +[version] +9.3 + [lib] lib/ext/**.jar 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 14152d5f2b..026bd2702d 100644 --- a/jetty-start/src/test/resources/dist-home/modules/fcgi.mod +++ b/jetty-start/src/test/resources/dist-home/modules/fcgi.mod @@ -2,6 +2,9 @@ # FastCGI Module # +[version] +9.3 + [depend] servlet client 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 1efc834648..3f318c4ea6 100644 --- a/jetty-start/src/test/resources/dist-home/modules/gzip.mod +++ b/jetty-start/src/test/resources/dist-home/modules/gzip.mod @@ -3,6 +3,9 @@ # Applies GzipHandler to entire server # +[version] +9.3 + [depend] server diff --git a/jetty-start/src/test/resources/dist-home/modules/hawtio.mod b/jetty-start/src/test/resources/dist-home/modules/hawtio.mod index 2dfb31b150..5a98ab8dc8 100644 --- a/jetty-start/src/test/resources/dist-home/modules/hawtio.mod +++ b/jetty-start/src/test/resources/dist-home/modules/hawtio.mod @@ -2,6 +2,9 @@ # Hawtio x module # +[version] +9.3 + [depend] stats deploy diff --git a/jetty-start/src/test/resources/dist-home/modules/home-base-warning.mod b/jetty-start/src/test/resources/dist-home/modules/home-base-warning.mod index 28e5757e81..c84dbdcf42 100644 --- a/jetty-start/src/test/resources/dist-home/modules/home-base-warning.mod +++ b/jetty-start/src/test/resources/dist-home/modules/home-base-warning.mod @@ -2,6 +2,9 @@ # Home and Base Warning # +[version] +9.3 + [xml] etc/home-base-warning.xml 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 0957a796c5..d8d10f75a2 100644 --- a/jetty-start/src/test/resources/dist-home/modules/http.mod +++ b/jetty-start/src/test/resources/dist-home/modules/http.mod @@ -2,6 +2,9 @@ # Jetty HTTP Connector # +[version] +9.3 + [depend] server @@ -15,7 +18,7 @@ etc/jetty-http.xml # jetty.http.host=0.0.0.0 ## Connector port to listen on -# jetty.http.port=80 +jetty.http.port=8080 ## Connector idle timeout in milliseconds # jetty.http.idleTimeout=30000 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 585c1fa5ee..d541aef0ab 100644 --- a/jetty-start/src/test/resources/dist-home/modules/http2.mod +++ b/jetty-start/src/test/resources/dist-home/modules/http2.mod @@ -2,6 +2,9 @@ # HTTP2 Support Module # +[version] +9.3 + [depend] ssl alpn 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 15883cab2c..a165dfdb84 100644 --- a/jetty-start/src/test/resources/dist-home/modules/http2c.mod +++ b/jetty-start/src/test/resources/dist-home/modules/http2c.mod @@ -5,6 +5,9 @@ # The resulting connector will accept both HTTP/1 and HTTP/2 connections. # +[version] +9.3 + [depend] http diff --git a/jetty-start/src/test/resources/dist-home/modules/https.mod b/jetty-start/src/test/resources/dist-home/modules/https.mod index 34f3344db6..88e7c08f6e 100644 --- a/jetty-start/src/test/resources/dist-home/modules/https.mod +++ b/jetty-start/src/test/resources/dist-home/modules/https.mod @@ -2,9 +2,15 @@ # Jetty HTTPS Connector # +[version] +9.3 + [depend] ssl +[optional] +http2 + [xml] etc/jetty-https.xml diff --git a/jetty-start/src/test/resources/dist-home/modules/infinispan.mod b/jetty-start/src/test/resources/dist-home/modules/infinispan.mod new file mode 100644 index 0000000000..2f04d18257 --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/modules/infinispan.mod @@ -0,0 +1,38 @@ +# +# Jetty Infinispan module +# + +[version] +9.3 + +[depend] +annotations +webapp + + +[files] +maven://org.infinispan/infinispan-core/7.1.1.Final|lib/infinispan/infinispan-core-7.1.1.Final.jar +maven://org.infinispan/infinispan-commons/7.1.1.Final|lib/infinispan/infinispan-commons-7.1.1.Final.jar +maven://org.jgroups/jgroups/3.6.1.Final|lib/infinispan/jgroups-3.6.1.Final.jar +maven://org.jboss.marshalling/jboss-marshalling-osgi/1.4.4.Final|lib/infinispan/jboss-marshalling-osgi-1.4.4.Final.jar +maven://org.jboss.logging/jboss-logging/3.1.2.GA|lib/infinispan/jboss-logging-3.1.2.GA.jar + +[lib] +lib/jetty-infinispan-${jetty.version}.jar +lib/infinispan/*.jar + + +[xml] +etc/jetty-infinispan.xml + +[license] +Infinispan is an open source project hosted on Github and released under the Apache 2.0 license. +http://infinispan.org/ +http://www.apache.org/licenses/LICENSE-2.0.html + +[ini-template] +## Infinispan Session config + +## Unique identifier for this node in the cluster +jetty.infinispanSession.workerName=node1 + diff --git a/jetty-start/src/test/resources/dist-home/modules/ipaccess.mod b/jetty-start/src/test/resources/dist-home/modules/ipaccess.mod index 956ea0f2e3..caafa4c5ef 100644 --- a/jetty-start/src/test/resources/dist-home/modules/ipaccess.mod +++ b/jetty-start/src/test/resources/dist-home/modules/ipaccess.mod @@ -2,6 +2,9 @@ # IPAccess module # +[version] +9.3 + [depend] server 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 fee3f59d87..483aa6515b 100644 --- a/jetty-start/src/test/resources/dist-home/modules/jaas.mod +++ b/jetty-start/src/test/resources/dist-home/modules/jaas.mod @@ -2,6 +2,9 @@ # JAAS Module # +[version] +9.3 + [depend] server diff --git a/jetty-start/src/test/resources/dist-home/modules/jamon.mod b/jetty-start/src/test/resources/dist-home/modules/jamon.mod index 965b8db634..93589a3569 100644 --- a/jetty-start/src/test/resources/dist-home/modules/jamon.mod +++ b/jetty-start/src/test/resources/dist-home/modules/jamon.mod @@ -2,6 +2,9 @@ # JAMon Jetty module # +[version] +9.3 + [depend] stats deploy diff --git a/jetty-start/src/test/resources/dist-home/modules/jaspi.mod b/jetty-start/src/test/resources/dist-home/modules/jaspi.mod index e7019ae1b6..ab30b7dcd4 100644 --- a/jetty-start/src/test/resources/dist-home/modules/jaspi.mod +++ b/jetty-start/src/test/resources/dist-home/modules/jaspi.mod @@ -2,6 +2,9 @@ # Jetty JASPI Module # +[version] +9.3 + [depend] security diff --git a/jetty-start/src/test/resources/dist-home/modules/jdbc-sessions.mod b/jetty-start/src/test/resources/dist-home/modules/jdbc-sessions.mod new file mode 100644 index 0000000000..b59787884d --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/modules/jdbc-sessions.mod @@ -0,0 +1,30 @@ +# +# Jetty JDBC Session module +# + +[version] +9.3 + +[depend] +annotations +webapp + +[xml] +etc/jetty-jdbc-sessions.xml + + +[ini-template] +## JDBC Session config + +## Unique identifier for this node in the cluster +jetty.jdbcSession.workerName=node1 + +## The interval in seconds between sweeps of the scavenger +jetty.jdbcSession.scavenge=600 + +##Uncomment either the datasource name or driverClass and connectionURL +#jetty.jdbcSession.datasource=sessions +#jetty.jdbcSession.driverClass=changeme +#jetty.jdbcSession.connectionURL=changeme + + diff --git a/jetty-start/src/test/resources/dist-home/modules/jminix.mod b/jetty-start/src/test/resources/dist-home/modules/jminix.mod index 9df4e26e2c..785537c51e 100644 --- a/jetty-start/src/test/resources/dist-home/modules/jminix.mod +++ b/jetty-start/src/test/resources/dist-home/modules/jminix.mod @@ -2,6 +2,9 @@ # JaMON Jetty module # +[version] +9.3 + [depend] stats jmx 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 f8a5111d8f..aeb2e16cb3 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 @@ -2,6 +2,9 @@ # JMX Remote Module # +[version] +9.3 + [depend] jmx diff --git a/jetty-start/src/test/resources/dist-home/modules/jmx.mod b/jetty-start/src/test/resources/dist-home/modules/jmx.mod index ee091c706a..21228e67a2 100644 --- a/jetty-start/src/test/resources/dist-home/modules/jmx.mod +++ b/jetty-start/src/test/resources/dist-home/modules/jmx.mod @@ -2,6 +2,9 @@ # JMX Module # +[version] +9.3 + [depend] server diff --git a/jetty-start/src/test/resources/dist-home/modules/jndi.mod b/jetty-start/src/test/resources/dist-home/modules/jndi.mod index 33c077ce68..4e3603130d 100644 --- a/jetty-start/src/test/resources/dist-home/modules/jndi.mod +++ b/jetty-start/src/test/resources/dist-home/modules/jndi.mod @@ -2,6 +2,9 @@ # JNDI Support # +[version] +9.3 + [depend] server diff --git a/jetty-start/src/test/resources/dist-home/modules/jolokia.mod b/jetty-start/src/test/resources/dist-home/modules/jolokia.mod index da8ac8f8c2..0b1f664bee 100644 --- a/jetty-start/src/test/resources/dist-home/modules/jolokia.mod +++ b/jetty-start/src/test/resources/dist-home/modules/jolokia.mod @@ -2,6 +2,9 @@ # Jolokia Jetty module # +[version] +9.3 + [depend] stats deploy diff --git a/jetty-start/src/test/resources/dist-home/modules/jsp.mod b/jetty-start/src/test/resources/dist-home/modules/jsp.mod index a16cc93dc9..07b43b610c 100644 --- a/jetty-start/src/test/resources/dist-home/modules/jsp.mod +++ b/jetty-start/src/test/resources/dist-home/modules/jsp.mod @@ -2,6 +2,9 @@ # Jetty JSP Module # +[version] +9.3 + [depend] servlet annotations diff --git a/jetty-start/src/test/resources/dist-home/modules/jstl.mod b/jetty-start/src/test/resources/dist-home/modules/jstl.mod index efc310af6e..3a02136109 100644 --- a/jetty-start/src/test/resources/dist-home/modules/jstl.mod +++ b/jetty-start/src/test/resources/dist-home/modules/jstl.mod @@ -2,6 +2,9 @@ # Jetty JSTL Module # +[version] +9.3 + [depend] jsp apache-jstl diff --git a/jetty-start/src/test/resources/dist-home/modules/jvm.mod b/jetty-start/src/test/resources/dist-home/modules/jvm.mod index 195521c57f..6aa8c442b4 100644 --- a/jetty-start/src/test/resources/dist-home/modules/jvm.mod +++ b/jetty-start/src/test/resources/dist-home/modules/jvm.mod @@ -1,3 +1,6 @@ +[version] +9.3 + [ini-template] ## JVM Configuration ## If JVM args are include in an ini file then --exec is needed 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 15c2f2f2b3..2a17a5892e 100644 --- a/jetty-start/src/test/resources/dist-home/modules/logging.mod +++ b/jetty-start/src/test/resources/dist-home/modules/logging.mod @@ -2,6 +2,9 @@ # Jetty std err/out logging # +[version] +9.3 + [xml] etc/jetty-logging.xml 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 2f765d9af2..72bf652feb 100644 --- a/jetty-start/src/test/resources/dist-home/modules/lowresources.mod +++ b/jetty-start/src/test/resources/dist-home/modules/lowresources.mod @@ -2,6 +2,9 @@ # Low Resources module # +[version] +9.3 + [depend] server diff --git a/jetty-start/src/test/resources/dist-home/modules/monitor.mod b/jetty-start/src/test/resources/dist-home/modules/monitor.mod index 09132c7b2c..d573e5908c 100644 --- a/jetty-start/src/test/resources/dist-home/modules/monitor.mod +++ b/jetty-start/src/test/resources/dist-home/modules/monitor.mod @@ -2,6 +2,9 @@ # Jetty Monitor module # +[version] +9.3 + [depend] server client diff --git a/jetty-start/src/test/resources/dist-home/modules/nosql.mod b/jetty-start/src/test/resources/dist-home/modules/nosql.mod new file mode 100644 index 0000000000..bbefc7f4d1 --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/modules/nosql.mod @@ -0,0 +1,35 @@ +# +# Jetty NoSql module +# + +[version] +9.3 + +[depend] +webapp + +[files] +maven://org.mongodb/mongo-java-driver/2.6.1|lib/nosql/mongo-java-driver-2.6.1.jar + +[lib] +lib/jetty-nosql-${jetty.version}.jar +lib/nosql/*.jar + +[xml] +etc/jetty-nosql.xml + +[license] +The java driver for the MongoDB document-based database system is hosted on GitHub and released under the Apache 2.0 license. +http://www.mongodb.org/ +http://www.apache.org/licenses/LICENSE-2.0.html + +[ini-template] +## MongoDB SessionIdManager config + +## Unique identifier for this node in the cluster +jetty.nosqlSession.workerName=node1 + + +## Interval in seconds between scavenging expired sessions +jetty.nosqlSession.scavenge=1800 + diff --git a/jetty-start/src/test/resources/dist-home/modules/plus.mod b/jetty-start/src/test/resources/dist-home/modules/plus.mod index aac0f8f3ec..4b5cdd5d0c 100644 --- a/jetty-start/src/test/resources/dist-home/modules/plus.mod +++ b/jetty-start/src/test/resources/dist-home/modules/plus.mod @@ -2,6 +2,9 @@ # Jetty Plus module # +[version] +9.3 + [depend] server security 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 6b91f68914..9e48d54994 100644 --- a/jetty-start/src/test/resources/dist-home/modules/proxy.mod +++ b/jetty-start/src/test/resources/dist-home/modules/proxy.mod @@ -2,6 +2,9 @@ # Jetty Proxy module # +[version] +9.3 + [depend] servlet client diff --git a/jetty-start/src/test/resources/dist-home/modules/quickstart.mod b/jetty-start/src/test/resources/dist-home/modules/quickstart.mod index 89db9fd4fe..6e5eee0957 100644 --- a/jetty-start/src/test/resources/dist-home/modules/quickstart.mod +++ b/jetty-start/src/test/resources/dist-home/modules/quickstart.mod @@ -2,6 +2,9 @@ # Jetty Quickstart module # +[version] +9.3 + [depend] server plus 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 37ed3440c8..a3afc062ea 100644 --- a/jetty-start/src/test/resources/dist-home/modules/requestlog.mod +++ b/jetty-start/src/test/resources/dist-home/modules/requestlog.mod @@ -2,6 +2,9 @@ # Request Log module # +[version] +9.3 + [depend] server diff --git a/jetty-start/src/test/resources/dist-home/modules/resources.mod b/jetty-start/src/test/resources/dist-home/modules/resources.mod index 8647d81325..91eed41bfd 100644 --- a/jetty-start/src/test/resources/dist-home/modules/resources.mod +++ b/jetty-start/src/test/resources/dist-home/modules/resources.mod @@ -2,6 +2,9 @@ # Module to add resources directory to classpath # +[version] +9.3 + [lib] resources/ 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 c8a1750618..cd55a1c459 100644 --- a/jetty-start/src/test/resources/dist-home/modules/rewrite.mod +++ b/jetty-start/src/test/resources/dist-home/modules/rewrite.mod @@ -1,6 +1,8 @@ # # Jetty Rewrite module # +[version] +9.3 [depend] server diff --git a/jetty-start/src/test/resources/dist-home/modules/security.mod b/jetty-start/src/test/resources/dist-home/modules/security.mod index ba3163275f..c9f9431603 100644 --- a/jetty-start/src/test/resources/dist-home/modules/security.mod +++ b/jetty-start/src/test/resources/dist-home/modules/security.mod @@ -2,6 +2,9 @@ # Jetty Security Module # +[version] +9.3 + [depend] server 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 6b5dbe95ba..524017f46d 100644 --- a/jetty-start/src/test/resources/dist-home/modules/server.mod +++ b/jetty-start/src/test/resources/dist-home/modules/server.mod @@ -2,6 +2,9 @@ # Base Server Module # +[version] +9.3 + [optional] jvm ext diff --git a/jetty-start/src/test/resources/dist-home/modules/servlet.mod b/jetty-start/src/test/resources/dist-home/modules/servlet.mod index fdb65c57a1..65bf86f5c5 100644 --- a/jetty-start/src/test/resources/dist-home/modules/servlet.mod +++ b/jetty-start/src/test/resources/dist-home/modules/servlet.mod @@ -2,6 +2,9 @@ # Jetty Servlet Module # +[version] +9.3 + [depend] server diff --git a/jetty-start/src/test/resources/dist-home/modules/servlets.mod b/jetty-start/src/test/resources/dist-home/modules/servlets.mod index e8724b87d7..453a9380fa 100644 --- a/jetty-start/src/test/resources/dist-home/modules/servlets.mod +++ b/jetty-start/src/test/resources/dist-home/modules/servlets.mod @@ -2,6 +2,9 @@ # Jetty Servlets Module # +[version] +9.3 + [depend] servlet diff --git a/jetty-start/src/test/resources/dist-home/modules/setuid.mod b/jetty-start/src/test/resources/dist-home/modules/setuid.mod index 41ef757e82..54fab8f262 100644 --- a/jetty-start/src/test/resources/dist-home/modules/setuid.mod +++ b/jetty-start/src/test/resources/dist-home/modules/setuid.mod @@ -2,6 +2,9 @@ # Set UID Feature # +[version] +9.3 + [depend] server diff --git a/jetty-start/src/test/resources/dist-home/modules/spring.mod b/jetty-start/src/test/resources/dist-home/modules/spring.mod index 444afb2f93..0e11358cfc 100644 --- a/jetty-start/src/test/resources/dist-home/modules/spring.mod +++ b/jetty-start/src/test/resources/dist-home/modules/spring.mod @@ -1,6 +1,9 @@ # # Spring # +[version] +9.3 + [name] spring 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 7893e17359..d491f18e64 100644 --- a/jetty-start/src/test/resources/dist-home/modules/ssl.mod +++ b/jetty-start/src/test/resources/dist-home/modules/ssl.mod @@ -1,15 +1,21 @@ # # SSL Keystore module # +[version] +9.3 + +[name] +ssl [depend] server [xml] etc/jetty-ssl.xml +etc/jetty-ssl-context.xml [files] -http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore +http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/test/config/etc/keystore?id=${jetty.tag.version}|etc/keystore [ini-template] ### TLS(SSL) Connector Configuration @@ -18,7 +24,7 @@ http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/ # jetty.ssl.host=0.0.0.0 ## Connector port to listen on -# jetty.ssl.port=443 +jetty.ssl.port=8443 ## Connector idle timeout in milliseconds # jetty.ssl.idleTimeout=30000 @@ -38,28 +44,42 @@ http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/ ## Thread priority delta to give to acceptor threads # jetty.ssl.acceptorPriorityDelta=0 +## Whether request host names are checked to match any SNI names +# jetty.ssl.sniHostCheck=true + ### SslContextFactory Configuration +## 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 ## Keystore file path (relative to $jetty.base) -# jetty.sslContext.keystorePath=etc/keystore +# jetty.sslContext.keyStorePath=etc/keystore ## Truststore file path (relative to $jetty.base) -# jetty.sslContext.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.sslContext.trustStorePath=etc/keystore ## Keystore password -# jetty.sslContext.keystorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +# jetty.sslContext.keyStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 + +## Keystore type and provider +# jetty.sslContext.keyStoreType=JKS +# jetty.sslContext.keyStoreProvider= ## KeyManager password # jetty.sslContext.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g ## Truststore password -# jetty.sslContext.truststorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +# jetty.sslContext.trustStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 + +## Truststore type and provider +# jetty.sslContext.trustStoreType=JKS +# jetty.sslContext.trustStoreProvider= ## whether client certificate authentication is required # jetty.sslContext.needClientAuth=false ## Whether client certificate authentication is desired # jetty.sslContext.wantClientAuth=false + +## Whether cipher order is significant (since java 8 only) +# jetty.sslContext.useCipherSuitesOrder=true + diff --git a/jetty-start/src/test/resources/dist-home/modules/stats.mod b/jetty-start/src/test/resources/dist-home/modules/stats.mod index 0922469cdf..0212f87879 100644 --- a/jetty-start/src/test/resources/dist-home/modules/stats.mod +++ b/jetty-start/src/test/resources/dist-home/modules/stats.mod @@ -2,6 +2,9 @@ # Stats module # +[version] +9.3 + [depend] server diff --git a/jetty-start/src/test/resources/dist-home/modules/webapp.mod b/jetty-start/src/test/resources/dist-home/modules/webapp.mod index 6bb37ef2ef..3f889b6a95 100644 --- a/jetty-start/src/test/resources/dist-home/modules/webapp.mod +++ b/jetty-start/src/test/resources/dist-home/modules/webapp.mod @@ -2,6 +2,9 @@ # WebApp Support Module # +[version] +9.3 + [depend] servlet security diff --git a/jetty-start/src/test/resources/dist-home/modules/websocket.mod b/jetty-start/src/test/resources/dist-home/modules/websocket.mod index e866b17989..768bcc8e7f 100644 --- a/jetty-start/src/test/resources/dist-home/modules/websocket.mod +++ b/jetty-start/src/test/resources/dist-home/modules/websocket.mod @@ -2,6 +2,9 @@ # WebSocket Module # +[version] +9.3 + [depend] # javax.websocket needs annotations annotations diff --git a/jetty-start/src/test/resources/jetty-version.properties b/jetty-start/src/test/resources/jetty-version.properties new file mode 100644 index 0000000000..968f6fc4a4 --- /dev/null +++ b/jetty-start/src/test/resources/jetty-version.properties @@ -0,0 +1 @@ +jetty.version=9.3
\ No newline at end of file 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 e1a69ed047..5707b4ce40 100644 --- a/jetty-start/src/test/resources/usecases/agent-properties.assert.txt +++ b/jetty-start/src/test/resources/usecases/agent-properties.assert.txt @@ -4,13 +4,13 @@ XML|${jetty.home}/etc/jetty-http.xml XML|${jetty.home}/etc/jetty-jmx.xml # The LIBs we expect (order is irrelevant) -LIB|${jetty.home}/lib/jetty-http-TEST.jar -LIB|${jetty.home}/lib/jetty-io-TEST.jar -LIB|${jetty.home}/lib/jetty-jmx-TEST.jar +LIB|${jetty.home}/lib/jetty-http-9.3.jar +LIB|${jetty.home}/lib/jetty-io-9.3.jar +LIB|${jetty.home}/lib/jetty-jmx-9.3.jar LIB|${jetty.home}/lib/jetty-schemas-3.1.jar -LIB|${jetty.home}/lib/jetty-server-TEST.jar -LIB|${jetty.home}/lib/jetty-util-TEST.jar -LIB|${jetty.home}/lib/jetty-xml-TEST.jar +LIB|${jetty.home}/lib/jetty-server-9.3.jar +LIB|${jetty.home}/lib/jetty-util-9.3.jar +LIB|${jetty.home}/lib/jetty-xml-9.3.jar LIB|${jetty.home}/lib/servlet-api-3.1.jar LIB|${jetty.base}/lib/agent-jdk-1.6.jar diff --git a/jetty-start/src/test/resources/usecases/barebones.assert.txt b/jetty-start/src/test/resources/usecases/barebones.assert.txt index 6f933edd33..3314346f91 100644 --- a/jetty-start/src/test/resources/usecases/barebones.assert.txt +++ b/jetty-start/src/test/resources/usecases/barebones.assert.txt @@ -3,12 +3,12 @@ XML|${jetty.home}/etc/jetty.xml XML|${jetty.home}/etc/jetty-http.xml # The LIBs we expect (order is irrelevant) -LIB|${jetty.home}/lib/jetty-http-TEST.jar -LIB|${jetty.home}/lib/jetty-io-TEST.jar +LIB|${jetty.home}/lib/jetty-http-9.3.jar +LIB|${jetty.home}/lib/jetty-io-9.3.jar LIB|${jetty.home}/lib/jetty-schemas-3.1.jar -LIB|${jetty.home}/lib/jetty-server-TEST.jar -LIB|${jetty.home}/lib/jetty-util-TEST.jar -LIB|${jetty.home}/lib/jetty-xml-TEST.jar +LIB|${jetty.home}/lib/jetty-server-9.3.jar +LIB|${jetty.home}/lib/jetty-util-9.3.jar +LIB|${jetty.home}/lib/jetty-xml-9.3.jar LIB|${jetty.home}/lib/servlet-api-3.1.jar # The Properties we expect (order is irrelevant) 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 df9ae27f5b..ab45829fe5 100644 --- a/jetty-start/src/test/resources/usecases/basic-properties.assert.txt +++ b/jetty-start/src/test/resources/usecases/basic-properties.assert.txt @@ -3,12 +3,12 @@ XML|${jetty.home}/etc/jetty.xml XML|${jetty.home}/etc/jetty-http.xml # The LIBs we expect (order is irrelevant) -LIB|${jetty.home}/lib/jetty-http-TEST.jar -LIB|${jetty.home}/lib/jetty-io-TEST.jar +LIB|${jetty.home}/lib/jetty-http-9.3.jar +LIB|${jetty.home}/lib/jetty-io-9.3.jar LIB|${jetty.home}/lib/jetty-schemas-3.1.jar -LIB|${jetty.home}/lib/jetty-server-TEST.jar -LIB|${jetty.home}/lib/jetty-util-TEST.jar -LIB|${jetty.home}/lib/jetty-xml-TEST.jar +LIB|${jetty.home}/lib/jetty-server-9.3.jar +LIB|${jetty.home}/lib/jetty-util-9.3.jar +LIB|${jetty.home}/lib/jetty-xml-9.3.jar LIB|${jetty.home}/lib/servlet-api-3.1.jar # The Properties we expect (order is irrelevant) diff --git a/jetty-start/src/test/resources/usecases/database.assert.txt b/jetty-start/src/test/resources/usecases/database.assert.txt index fbd4bebd84..e8fd0ecd88 100644 --- a/jetty-start/src/test/resources/usecases/database.assert.txt +++ b/jetty-start/src/test/resources/usecases/database.assert.txt @@ -6,21 +6,21 @@ XML|${jetty.home}/etc/jetty-plus.xml XML|${jetty.base}/etc/jetty-db.xml # The LIBs we expect (order is irrelevant) -LIB|${jetty.home}/lib/jetty-http-TEST.jar -LIB|${jetty.home}/lib/jetty-io-TEST.jar +LIB|${jetty.home}/lib/jetty-http-9.3.jar +LIB|${jetty.home}/lib/jetty-io-9.3.jar LIB|${jetty.home}/lib/jetty-schemas-3.1.jar -LIB|${jetty.home}/lib/jetty-server-TEST.jar -LIB|${jetty.home}/lib/jetty-util-TEST.jar -LIB|${jetty.home}/lib/jetty-xml-TEST.jar +LIB|${jetty.home}/lib/jetty-server-9.3.jar +LIB|${jetty.home}/lib/jetty-util-9.3.jar +LIB|${jetty.home}/lib/jetty-xml-9.3.jar LIB|${jetty.home}/lib/servlet-api-3.1.jar -LIB|${jetty.home}/lib/jetty-jndi-TEST.jar +LIB|${jetty.home}/lib/jetty-jndi-9.3.jar LIB|${jetty.home}/lib/jndi/javax.mail.glassfish-1.4.1.v201005082020.jar LIB|${jetty.home}/lib/jndi/javax.transaction-api-1.2.jar -LIB|${jetty.home}/lib/jetty-plus-TEST.jar -LIB|${jetty.home}/lib/jetty-deploy-TEST.jar -LIB|${jetty.home}/lib/jetty-security-TEST.jar -LIB|${jetty.home}/lib/jetty-webapp-TEST.jar -LIB|${jetty.home}/lib/jetty-servlet-TEST.jar +LIB|${jetty.home}/lib/jetty-plus-9.3.jar +LIB|${jetty.home}/lib/jetty-deploy-9.3.jar +LIB|${jetty.home}/lib/jetty-security-9.3.jar +LIB|${jetty.home}/lib/jetty-webapp-9.3.jar +LIB|${jetty.home}/lib/jetty-servlet-9.3.jar LIB|${jetty.base}/lib/db/mysql-driver.jar LIB|${jetty.base}/lib/db/bonecp.jar 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 8b18c19866..bb8684e131 100644 --- a/jetty-start/src/test/resources/usecases/deep-ext.assert.txt +++ b/jetty-start/src/test/resources/usecases/deep-ext.assert.txt @@ -3,12 +3,12 @@ XML|${jetty.home}/etc/jetty.xml XML|${jetty.home}/etc/jetty-http.xml # The LIBs we expect (order is irrelevant) -LIB|${jetty.home}/lib/jetty-http-TEST.jar -LIB|${jetty.home}/lib/jetty-io-TEST.jar +LIB|${jetty.home}/lib/jetty-http-9.3.jar +LIB|${jetty.home}/lib/jetty-io-9.3.jar LIB|${jetty.home}/lib/jetty-schemas-3.1.jar -LIB|${jetty.home}/lib/jetty-server-TEST.jar -LIB|${jetty.home}/lib/jetty-util-TEST.jar -LIB|${jetty.home}/lib/jetty-xml-TEST.jar +LIB|${jetty.home}/lib/jetty-server-9.3.jar +LIB|${jetty.home}/lib/jetty-util-9.3.jar +LIB|${jetty.home}/lib/jetty-xml-9.3.jar LIB|${jetty.home}/lib/servlet-api-3.1.jar LIB|${jetty.base}/lib/ext/agent.jar LIB|${jetty.base}/lib/ext/jdbc/mariadb-jdbc.jar diff --git a/jetty-start/src/test/resources/usecases/http2.assert.txt b/jetty-start/src/test/resources/usecases/http2.assert.txt index ec70292e18..574c4d08bb 100644 --- a/jetty-start/src/test/resources/usecases/http2.assert.txt +++ b/jetty-start/src/test/resources/usecases/http2.assert.txt @@ -3,23 +3,24 @@ XML|${jetty.home}/etc/jetty.xml XML|${jetty.home}/etc/jetty-http.xml XML|${jetty.home}/etc/jetty-jmx.xml XML|${jetty.home}/etc/jetty-ssl.xml +XML|${jetty.home}/etc/jetty-ssl-context.xml XML|${jetty.home}/etc/jetty-alpn.xml XML|${jetty.home}/etc/jetty-http2.xml # The LIBs we expect (order is irrelevant) -LIB|${jetty.home}/lib/jetty-http-TEST.jar -LIB|${jetty.home}/lib/jetty-io-TEST.jar -LIB|${jetty.home}/lib/jetty-jmx-TEST.jar +LIB|${jetty.home}/lib/jetty-http-9.3.jar +LIB|${jetty.home}/lib/jetty-io-9.3.jar +LIB|${jetty.home}/lib/jetty-jmx-9.3.jar LIB|${jetty.home}/lib/jetty-schemas-3.1.jar -LIB|${jetty.home}/lib/jetty-server-TEST.jar -LIB|${jetty.home}/lib/jetty-util-TEST.jar -LIB|${jetty.home}/lib/jetty-xml-TEST.jar +LIB|${jetty.home}/lib/jetty-server-9.3.jar +LIB|${jetty.home}/lib/jetty-util-9.3.jar +LIB|${jetty.home}/lib/jetty-xml-9.3.jar LIB|${jetty.home}/lib/servlet-api-3.1.jar -LIB|${jetty.home}/lib/jetty-alpn-server-TEST.jar -LIB|${jetty.home}/lib/http2/http2-common-TEST.jar -LIB|${jetty.home}/lib/http2/http2-hpack-TEST.jar -LIB|${jetty.home}/lib/http2/http2-server-TEST.jar +LIB|${jetty.home}/lib/jetty-alpn-server-9.3.jar +LIB|${jetty.home}/lib/http2/http2-common-9.3.jar +LIB|${jetty.home}/lib/http2/http2-hpack-9.3.jar +LIB|${jetty.home}/lib/http2/http2-server-9.3.jar # The Properties we expect (order is irrelevant) # (this is the property we actually set in jetty.base) @@ -33,7 +34,7 @@ PROP|jetty.sslContext.trustStorePassword=sundae # The Downloads DOWNLOAD|maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar -DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore +DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/test/config/etc/keystore?id=master|etc/keystore # The Bootlib BOOTLIB|-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar 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 85453e8674..60f10dd0af 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 @@ -5,13 +5,13 @@ XML|${jetty.home}/etc/jetty-http.xml XML|${jetty.home}/etc/jetty-jmx.xml # The LIBs we expect (order is irrelevant) -LIB|${jetty.home}/lib/jetty-http-TEST.jar -LIB|${jetty.home}/lib/jetty-io-TEST.jar -LIB|${jetty.home}/lib/jetty-jmx-TEST.jar +LIB|${jetty.home}/lib/jetty-http-9.3.jar +LIB|${jetty.home}/lib/jetty-io-9.3.jar +LIB|${jetty.home}/lib/jetty-jmx-9.3.jar LIB|${jetty.home}/lib/jetty-schemas-3.1.jar -LIB|${jetty.home}/lib/jetty-server-TEST.jar -LIB|${jetty.home}/lib/jetty-util-TEST.jar -LIB|${jetty.home}/lib/jetty-xml-TEST.jar +LIB|${jetty.home}/lib/jetty-server-9.3.jar +LIB|${jetty.home}/lib/jetty-util-9.3.jar +LIB|${jetty.home}/lib/jetty-xml-9.3.jar LIB|${jetty.home}/lib/servlet-api-3.1.jar LIB|${jetty.base}/resources LIB|${maven-test-resources}/extra-jetty-dirs/logging/lib/logging/logback.jar diff --git a/jetty-start/src/test/resources/usecases/jmx.assert.txt b/jetty-start/src/test/resources/usecases/jmx.assert.txt index 4bfc6903d8..205c2eae72 100644 --- a/jetty-start/src/test/resources/usecases/jmx.assert.txt +++ b/jetty-start/src/test/resources/usecases/jmx.assert.txt @@ -4,13 +4,13 @@ XML|${jetty.home}/etc/jetty-http.xml XML|${jetty.home}/etc/jetty-jmx.xml # The LIBs we expect (order is irrelevant) -LIB|${jetty.home}/lib/jetty-http-TEST.jar -LIB|${jetty.home}/lib/jetty-io-TEST.jar -LIB|${jetty.home}/lib/jetty-jmx-TEST.jar +LIB|${jetty.home}/lib/jetty-http-9.3.jar +LIB|${jetty.home}/lib/jetty-io-9.3.jar +LIB|${jetty.home}/lib/jetty-jmx-9.3.jar LIB|${jetty.home}/lib/jetty-schemas-3.1.jar -LIB|${jetty.home}/lib/jetty-server-TEST.jar -LIB|${jetty.home}/lib/jetty-util-TEST.jar -LIB|${jetty.home}/lib/jetty-xml-TEST.jar +LIB|${jetty.home}/lib/jetty-server-9.3.jar +LIB|${jetty.home}/lib/jetty-util-9.3.jar +LIB|${jetty.home}/lib/jetty-xml-9.3.jar LIB|${jetty.home}/lib/servlet-api-3.1.jar # The Properties we expect (order is irrelevant) diff --git a/jetty-start/src/test/resources/usecases/jsp.assert.txt b/jetty-start/src/test/resources/usecases/jsp.assert.txt index cf6d3a4ab0..96bd0ca416 100644 --- a/jetty-start/src/test/resources/usecases/jsp.assert.txt +++ b/jetty-start/src/test/resources/usecases/jsp.assert.txt @@ -5,28 +5,28 @@ XML|${jetty.home}/etc/jetty-plus.xml XML|${jetty.home}/etc/jetty-annotations.xml # The LIBs we expect (order is irrelevant) -LIB|${jetty.home}/lib/jetty-annotations-TEST.jar +LIB|${jetty.home}/lib/jetty-annotations-9.3.jar LIB|${jetty.home}/lib/annotations/asm-5.0.1.jar LIB|${jetty.home}/lib/annotations/asm-commons-5.0.1.jar LIB|${jetty.home}/lib/annotations/javax.annotation-api-1.2.jar -LIB|${jetty.home}/lib/jetty-http-TEST.jar -LIB|${jetty.home}/lib/jetty-io-TEST.jar -LIB|${jetty.home}/lib/jetty-jndi-TEST.jar +LIB|${jetty.home}/lib/jetty-http-9.3.jar +LIB|${jetty.home}/lib/jetty-io-9.3.jar +LIB|${jetty.home}/lib/jetty-jndi-9.3.jar LIB|${jetty.home}/lib/jndi/javax.mail.glassfish-1.4.1.v201005082020.jar LIB|${jetty.home}/lib/jndi/javax.transaction-api-1.2.jar -LIB|${jetty.home}/lib/jetty-plus-TEST.jar +LIB|${jetty.home}/lib/jetty-plus-9.3.jar LIB|${jetty.home}/lib/jetty-schemas-3.1.jar -LIB|${jetty.home}/lib/jetty-security-TEST.jar -LIB|${jetty.home}/lib/jetty-server-TEST.jar -LIB|${jetty.home}/lib/jetty-servlet-TEST.jar -LIB|${jetty.home}/lib/jetty-util-TEST.jar -LIB|${jetty.home}/lib/jetty-webapp-TEST.jar -LIB|${jetty.home}/lib/jetty-xml-TEST.jar +LIB|${jetty.home}/lib/jetty-security-9.3.jar +LIB|${jetty.home}/lib/jetty-server-9.3.jar +LIB|${jetty.home}/lib/jetty-servlet-9.3.jar +LIB|${jetty.home}/lib/jetty-util-9.3.jar +LIB|${jetty.home}/lib/jetty-webapp-9.3.jar +LIB|${jetty.home}/lib/jetty-xml-9.3.jar LIB|${jetty.home}/lib/servlet-api-3.1.jar -LIB|${jetty.home}/lib/apache-jsp/org.eclipse.jetty.apache-jsp-TEST.jar +LIB|${jetty.home}/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.3.jar LIB|${jetty.home}/lib/apache-jsp/org.eclipse.jetty.orbit.org.eclipse.jdt.core-3.8.2.v20130121.jar -LIB|${jetty.home}/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.9.M3.jar -LIB|${jetty.home}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.9.M3.jar +LIB|${jetty.home}/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.20.M0.jar +LIB|${jetty.home}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.20.M0.jar # The Properties we expect (order is irrelevant) # (these are the properties we actually set in the configuration) diff --git a/jetty-start/src/test/resources/usecases/logging.assert.txt b/jetty-start/src/test/resources/usecases/logging.assert.txt index 4b5df4c365..90780a970b 100644 --- a/jetty-start/src/test/resources/usecases/logging.assert.txt +++ b/jetty-start/src/test/resources/usecases/logging.assert.txt @@ -3,12 +3,12 @@ XML|${jetty.home}/etc/jetty.xml XML|${jetty.home}/etc/jetty-http.xml # The LIBs we expect (order is irrelevant) -LIB|${jetty.home}/lib/jetty-http-TEST.jar -LIB|${jetty.home}/lib/jetty-io-TEST.jar +LIB|${jetty.home}/lib/jetty-http-9.3.jar +LIB|${jetty.home}/lib/jetty-io-9.3.jar LIB|${jetty.home}/lib/jetty-schemas-3.1.jar -LIB|${jetty.home}/lib/jetty-server-TEST.jar -LIB|${jetty.home}/lib/jetty-util-TEST.jar -LIB|${jetty.home}/lib/jetty-xml-TEST.jar +LIB|${jetty.home}/lib/jetty-server-9.3.jar +LIB|${jetty.home}/lib/jetty-util-9.3.jar +LIB|${jetty.home}/lib/jetty-xml-9.3.jar LIB|${jetty.home}/lib/servlet-api-3.1.jar LIB|${jetty.base}/lib/logging/slf4j-api.jar LIB|${jetty.base}/lib/logging/jul-to-slf4j.jar diff --git a/jetty-start/src/test/resources/usecases/versioned-modules-too-new/modules/http.mod b/jetty-start/src/test/resources/usecases/versioned-modules-too-new/modules/http.mod new file mode 100644 index 0000000000..cff8028513 --- /dev/null +++ b/jetty-start/src/test/resources/usecases/versioned-modules-too-new/modules/http.mod @@ -0,0 +1,39 @@ +# +# Jetty HTTP Connector +# + +[version] +9.3 + +[depend] +server + +[xml] +etc/jetty-http.xml + +[ini-template] +### HTTP Connector Configuration + +## Connector host/address to bind to +# jetty.http.host=0.0.0.0 + +## Connector port to listen on +# jetty.http.port=80 + +## Connector idle timeout in milliseconds +# jetty.http.idleTimeout=30000 + +## 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/usecases/versioned-modules-too-new/modules/http3.mod b/jetty-start/src/test/resources/usecases/versioned-modules-too-new/modules/http3.mod new file mode 100644 index 0000000000..34ec477416 --- /dev/null +++ b/jetty-start/src/test/resources/usecases/versioned-modules-too-new/modules/http3.mod @@ -0,0 +1,10 @@ +# +# Fake Jetty HTTP/3 Connector +# + +[version] +10.0 + +[depend] +server + diff --git a/jetty-start/src/test/resources/usecases/versioned-modules-too-new/start.ini b/jetty-start/src/test/resources/usecases/versioned-modules-too-new/start.ini new file mode 100644 index 0000000000..42b2db88de --- /dev/null +++ b/jetty-start/src/test/resources/usecases/versioned-modules-too-new/start.ini @@ -0,0 +1,6 @@ + +--module=server +--module=http +--module=http3 + +jetty.http.port=9090 diff --git a/jetty-start/src/test/resources/usecases/versioned-modules.assert.txt b/jetty-start/src/test/resources/usecases/versioned-modules.assert.txt new file mode 100644 index 0000000000..f1b8108929 --- /dev/null +++ b/jetty-start/src/test/resources/usecases/versioned-modules.assert.txt @@ -0,0 +1,18 @@ +# The XMLs we expect (order is important) +XML|${jetty.home}/etc/jetty.xml +XML|${jetty.home}/etc/jetty-http.xml + +# The LIBs we expect (order is irrelevant) +LIB|${jetty.home}/lib/jetty-http-9.3.jar +LIB|${jetty.home}/lib/jetty-io-9.3.jar +LIB|${jetty.home}/lib/jetty-schemas-3.1.jar +LIB|${jetty.home}/lib/jetty-server-9.3.jar +LIB|${jetty.home}/lib/jetty-util-9.3.jar +LIB|${jetty.home}/lib/jetty-xml-9.3.jar +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.http.port=9090 +PROP|from-module=old +PROP|the-future=is-new diff --git a/jetty-start/src/test/resources/usecases/versioned-modules/modules/http.mod b/jetty-start/src/test/resources/usecases/versioned-modules/modules/http.mod new file mode 100644 index 0000000000..cff8028513 --- /dev/null +++ b/jetty-start/src/test/resources/usecases/versioned-modules/modules/http.mod @@ -0,0 +1,39 @@ +# +# Jetty HTTP Connector +# + +[version] +9.3 + +[depend] +server + +[xml] +etc/jetty-http.xml + +[ini-template] +### HTTP Connector Configuration + +## Connector host/address to bind to +# jetty.http.host=0.0.0.0 + +## Connector port to listen on +# jetty.http.port=80 + +## Connector idle timeout in milliseconds +# jetty.http.idleTimeout=30000 + +## 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/usecases/versioned-modules/modules/new.mod b/jetty-start/src/test/resources/usecases/versioned-modules/modules/new.mod new file mode 100644 index 0000000000..ae1b359a1c --- /dev/null +++ b/jetty-start/src/test/resources/usecases/versioned-modules/modules/new.mod @@ -0,0 +1,10 @@ +# +# New Module (testing module based defaults) +# + +[version] +9.3 + +[ini] +the-future=is-new + diff --git a/jetty-start/src/test/resources/usecases/versioned-modules/modules/old.mod b/jetty-start/src/test/resources/usecases/versioned-modules/modules/old.mod new file mode 100644 index 0000000000..79fcfcb81d --- /dev/null +++ b/jetty-start/src/test/resources/usecases/versioned-modules/modules/old.mod @@ -0,0 +1,7 @@ +# +# Old Module (backward compat test with 9.2 modules) +# + +[ini-template] +from-module=old + diff --git a/jetty-start/src/test/resources/usecases/versioned-modules/start.ini b/jetty-start/src/test/resources/usecases/versioned-modules/start.ini new file mode 100644 index 0000000000..c306053048 --- /dev/null +++ b/jetty-start/src/test/resources/usecases/versioned-modules/start.ini @@ -0,0 +1,7 @@ + +--module=server +--module=http +--module=old +--module=new + +jetty.http.port=9090 |