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

469860 - Add module metadata versioning to support backwards compat 

+ Added [version] section support to start.jar
+ Updated start testing to use as-is distro configuration for test cases
This commit is contained in:
Joakim Erdfelt 2015-06-10 10:42:40 -07:00
parent 2ff20414fa
commit 8bbbb2ff54
89 changed files with 641 additions and 815 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
View File

@ -237,7 +237,7 @@ public class Main
args.dumpActiveXmls(baseHome);
}
private void listModules(StartArgs args)
public void listModules(StartArgs args)
{
StartLog.endStartLog();
System.out.println();
@ -309,6 +309,17 @@ public class Main
args.setAllModules(modules);
List<Module> activeModules = modules.getSelected();
final Version START_VERSION = new Version(StartArgs.VERSION);
for(Module enabled: activeModules)
{
if(enabled.getVersion().isNewerThan(START_VERSION))
{
throw new UsageException(UsageException.ERR_BAD_GRAPH, "Module [" + enabled.getName() + "] specifies jetty version [" + enabled.getVersion()
+ "] which is newer than this version of jetty [" + START_VERSION + "]");
}
}
for(String name: args.getSkipFileValidationModules())
{
Module module = modules.get(name);

42
jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
View File

@ -40,6 +40,8 @@ import org.eclipse.jetty.start.graph.Node;
*/
public class Module extends Node<Module>
{
private static final String VERSION_UNSPECIFIED = "9.2";
public static class NameComparator implements Comparator<Module>
{
private Collator collator = Collator.getInstance();
@ -60,10 +62,17 @@ public class Module extends Node<Module>
/** The name of this Module (as a filesystem reference) */
private String fileRef;
/** The version of Jetty the module supports */
private Version version;
/** List of xml configurations for this Module */
private List<String> xmls;
/** List of ini template lines */
private List<String> iniTemplate;
private boolean hasIniTemplate = false;
/** List of default config */
private List<String> defaultConfig;
private boolean hasDefaultConfig = false;
@ -140,6 +149,11 @@ public class Module extends Node<Module>
return defaultConfig;
}
public List<String> getIniTemplate()
{
return iniTemplate;
}
public List<String> getFiles()
{
return files;
@ -175,11 +189,21 @@ public class Module extends Node<Module>
return xmls;
}
public Version getVersion()
{
return version;
}
public boolean hasDefaultConfig()
{
return hasDefaultConfig;
}
public boolean hasIniTemplate()
{
return hasIniTemplate;
}
@Override
public int hashCode()
{
@ -198,6 +222,7 @@ public class Module extends Node<Module>
{
xmls = new ArrayList<>();
defaultConfig = new ArrayList<>();
iniTemplate = new ArrayList<>();
libs = new ArrayList<>();
files = new ArrayList<>();
jvmArgs = new ArrayList<>();
@ -283,10 +308,13 @@ public class Module extends Node<Module>
files.add(line);
break;
case "DEFAULTS":
case "INI-TEMPLATE":
defaultConfig.add(line);
hasDefaultConfig = true;
break;
case "INI-TEMPLATE":
iniTemplate.add(line);
hasIniTemplate = true;
break;
case "LIB":
libs.add(line);
break;
@ -303,6 +331,13 @@ public class Module extends Node<Module>
case "EXEC":
jvmArgs.add(line);
break;
case "VERSION":
if (version != null)
{
throw new IOException("[version] already specified");
}
version = new Version(line);
break;
case "XML":
xmls.add(line);
break;
@ -313,6 +348,11 @@ public class Module extends Node<Module>
}
}
}
if (version == null)
{
version = new Version(VERSION_UNSPECIFIED);
}
}
public void setEnabled(boolean enabled)

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

@ -67,7 +67,7 @@ public class StartArgs
if (ver == null)
{
ver = "TEST";
ver = "0.0";
if (tag == null)
{
tag = "master";
@ -161,13 +161,13 @@ public class StartArgs
private void addFile(Module module, String uriLocation)
{
if(module.isSkipFilesValidation())
if (module.isSkipFilesValidation())
{
StartLog.debug("Not validating %s [files] for %s",module,uriLocation);
return;
}
FileArg arg = new FileArg(module, properties.expand(uriLocation));
FileArg arg = new FileArg(module,properties.expand(uriLocation));
if (!files.contains(arg))
{
files.add(arg);
@ -380,7 +380,8 @@ public class StartArgs
}
/**
* Ensure that the System Properties are set (if defined as a System property, or start.config property, or start.ini property)
* Ensure that the System Properties are set (if defined as a System property, or start.config property, or
* start.ini property)
*
* @param key
* the key to be sure of
@ -408,8 +409,10 @@ public class StartArgs
/**
* Expand any command line added <code>--lib</code> lib references.
*
* @param baseHome the base home in use
* @throws IOException if unable to expand the libraries
* @param baseHome
* the base home in use
* @throws IOException
* if unable to expand the libraries
*/
public void expandLibs(BaseHome baseHome) throws IOException
{
@ -433,9 +436,12 @@ public class StartArgs
/**
* Build up the Classpath and XML file references based on enabled Module list.
*
* @param baseHome the base home in use
* @param activeModules the active (selected) modules
* @throws IOException if unable to expand the modules
* @param baseHome
* the base home in use
* @param activeModules
* the active (selected) modules
* @throws IOException
* if unable to expand the modules
*/
public void expandModules(BaseHome baseHome, List<Module> activeModules) throws IOException
{
@ -465,7 +471,7 @@ public class StartArgs
for (String xmlRef : module.getXmls())
{
// Straight Reference
xmlRef=properties.expand(xmlRef);
xmlRef = properties.expand(xmlRef);
Path xmlfile = baseHome.getPath(xmlRef);
addUniqueXmlFile(xmlRef,xmlfile);
}
@ -552,7 +558,7 @@ public class StartArgs
if (dryRun || isExec())
{
for (Prop p : properties)
cmd.addRawArg(CommandLineBuilder.quote(p.key)+"="+CommandLineBuilder.quote(p.value));
cmd.addRawArg(CommandLineBuilder.quote(p.key) + "=" + CommandLineBuilder.quote(p.value));
}
else if (properties.size() > 0)
{
@ -760,9 +766,12 @@ public class StartArgs
/**
* Parse a single line of argument.
*
* @param rawarg the raw argument to parse
* @param source the origin of this line of argument
* @param replaceProps true if properties in this parse replace previous ones, false to not replace.
* @param rawarg
* the raw argument to parse
* @param source
* the origin of this line of argument
* @param replaceProps
* true if properties in this parse replace previous ones, false to not replace.
*/
private void parse(final String rawarg, String source, boolean replaceProps)
{
@ -1023,7 +1032,7 @@ public class StartArgs
{
propertyFileRefs.add(arg);
}
return;
return;
}
// Anything else is unrecognized
@ -1047,11 +1056,28 @@ public class StartArgs
public void parseModule(Module module)
{
if(module.hasDefaultConfig())
// Starting with Jetty 9.3 indicated modules, the default config
// is parsed from the [default] section only
if (module.getVersion().isNewerThanOrEqualTo(new Version("9.3")))
{
for(String line: module.getDefaultConfig())
if (module.hasDefaultConfig())
{
parse(line,module.getFilesystemRef(),false);
for (String line : module.getDefaultConfig())
{
parse(line,module.getFilesystemRef(),false);
}
}
}
else
{
// With Jetty 9.2 indicated modules and older, the default
// config is parsed from the [ini-template] section
if (module.hasIniTemplate())
{
for (String line : module.getIniTemplate())
{
parse(line,module.getFilesystemRef(),false);
}
}
}
}

65
jetty-start/src/main/java/org/eclipse/jetty/start/Version.java
View File

@ -21,30 +21,26 @@ package org.eclipse.jetty.start;
/**
* Utility class for parsing and comparing version strings. JDK 1.1 compatible.
*/
public class Version
public class Version implements Comparable<Version>
{
int _version = 0;
int _revision = 0;
int _subrevision = 0;
String _suffix = "";
public Version()
{
}
private int _version = 0;
private int _revision = -1;
private int _subrevision = -1;
private String _suffix = "";
public Version(String version_string)
{
parse(version_string);
}
// java.lang.Comparable is Java 1.2! Cannot use it
@Override
/**
* Compares with other version. Does not take extension into account, as there is no reliable way to order them.
*
* @param other the other version to compare this to
* @return -1 if this is older version that other, 0 if its same version, 1 if it's newer version than other
*/
public int compare(Version other)
public int compareTo(Version other)
{
if (other == null)
{
@ -77,15 +73,38 @@ public class Version
return 0;
}
public boolean isNewerThan(Version other)
{
return compareTo(other) == 1;
}
public boolean isNewerThanOrEqualTo(Version other)
{
int comp = compareTo(other);
return (comp == 0) || (comp == 1);
}
public boolean isOlderThan(Version other)
{
return compareTo(other) == -1;
}
public boolean isOlderThanOrEqualTo(Version other)
{
int comp = compareTo(other);
return (comp == 0) || (comp == -1);
}
/**
* Check whether this verion is in range of versions specified
* Check whether this version is in range of versions specified
*
* @param low the low part of the range
* @param high the high part of the range
* @return true if this version is within the provided range
*/
public boolean isInRange(Version low, Version high)
{
return ((compare(low) >= 0) && (compare(high) <= 0));
return ((compareTo(low) >= 0) && (compareTo(high) <= 0));
}
/**
@ -95,8 +114,8 @@ public class Version
public void parse(String version_string)
{
_version = 0;
_revision = 0;
_subrevision = 0;
_revision = -1;
_subrevision = -1;
_suffix = "";
int pos = 0;
int startpos = 0;
@ -138,11 +157,17 @@ public class Version
{
StringBuffer sb = new StringBuffer(10);
sb.append(_version);
sb.append('.');
sb.append(_revision);
sb.append('.');
sb.append(_subrevision);
sb.append(_suffix);
if (_revision >= 0)
{
sb.append('.');
sb.append(_revision);
if (_subrevision >= 0)
{
sb.append('.');
sb.append(_subrevision);
sb.append(_suffix);
}
}
return sb.toString();
}
}

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

@ -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");

4
jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java
View File

@ -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())

3
jetty-start/src/test/java/org/eclipse/jetty/start/PropertyPassingTest.java
View File

@ -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;

6
jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java
View File

@ -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);

4
jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java
View File

@ -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());

33
jetty-start/src/test/java/org/eclipse/jetty/start/VersionTest.java
View File

@ -18,20 +18,13 @@
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");
@ -47,19 +40,33 @@ public class VersionTest
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));
}
}

4
jetty-start/src/test/java/org/eclipse/jetty/start/util/RebuildTestResources.java
View File

@ -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);
}

68
jetty-start/src/test/resources/assert-home-with-http2.txt
View File

@ -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,58 +11,51 @@ 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
# (these are the ones set by default from jetty.home modules)
PROP|jetty.alpn.debug=false
PROP|jetty.http.port=8080
PROP|jetty.ssl.port=8443
PROP|jetty.httpConfig.delayDispatchUntilContent=false
PROP|jetty.server.dumpAfterStart=false
PROP|jetty.server.dumpBeforeStop=false
@ -80,7 +74,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/

46
jetty-start/src/test/resources/assert-home-with-jvm.txt
View File

@ -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)

46
jetty-start/src/test/resources/assert-home.txt
View File

@ -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

0
jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.eclipse.jetty.apache-jsp-TEST.jar → jetty-start/src/test/resources/dist-home/etc/jetty-infinispan.xml
View File

0
jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.9.M3.jar → jetty-start/src/test/resources/dist-home/etc/jetty-jdbc-sessions.xml
View File

0
jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.9.M3.jar → jetty-start/src/test/resources/dist-home/etc/jetty-nosql.xml
View File

0
jetty-start/src/test/resources/dist-home/lib/fcgi/fcgi-client-TEST.jar → jetty-start/src/test/resources/dist-home/etc/jetty-ssl-context.xml
View File

534
jetty-start/src/test/resources/dist-home/etc/webdefault.xml
View File

@ -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>

0
jetty-start/src/test/resources/dist-home/lib/fcgi/fcgi-server-TEST.jar → jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/http2/http2-common-TEST.jar → jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.20.M0.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/http2/http2-hpack-TEST.jar → jetty-start/src/test/resources/dist-home/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.20.M0.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/http2/http2-server-TEST.jar → jetty-start/src/test/resources/dist-home/lib/cdi-core-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-alpn-server-TEST.jar → jetty-start/src/test/resources/dist-home/lib/cdi-servlet-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-annotations-TEST.jar → jetty-start/src/test/resources/dist-home/lib/cdi-websocket-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-cdi-TEST.jar → jetty-start/src/test/resources/dist-home/lib/fcgi/fcgi-client-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-client-TEST.jar → jetty-start/src/test/resources/dist-home/lib/fcgi/fcgi-server-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-continuation-TEST.jar → jetty-start/src/test/resources/dist-home/lib/http2/http2-common-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-deploy-TEST.jar → jetty-start/src/test/resources/dist-home/lib/http2/http2-hpack-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-http-TEST.jar → jetty-start/src/test/resources/dist-home/lib/http2/http2-server-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-io-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-alpn-server-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-jaas-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-annotations-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-jaspi-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-client-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-jmx-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-continuation-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-jndi-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-deploy-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-plus-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-http-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-proxy-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-infinispan-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-quickstart-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-io-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-rewrite-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-jaas-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-security-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-jaspi-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-server-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-jmx-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-servlet-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-jndi-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-servlets-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-nosql-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-util-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-plus-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-webapp-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-proxy-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/jetty-xml-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-quickstart-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/monitor/jetty-monitor-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-rewrite-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/setuid/jetty-setuid-java-1.0.1.jar → jetty-start/src/test/resources/dist-home/lib/jetty-security-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/spring/jetty-spring-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-server-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/websocket/javax-websocket-client-impl-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-servlet-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/websocket/javax-websocket-server-impl-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-servlets-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/websocket/websocket-api-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-util-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/websocket/websocket-client-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-webapp-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/websocket/websocket-common-TEST.jar → jetty-start/src/test/resources/dist-home/lib/jetty-xml-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/websocket/websocket-server-TEST.jar → jetty-start/src/test/resources/dist-home/lib/monitor/jetty-monitor-9.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/websocket/websocket-servlet-TEST.jar → jetty-start/src/test/resources/dist-home/lib/setuid/jetty-setuid-java-1.0.3.jar
View File

0
jetty-start/src/test/resources/dist-home/lib/spring/jetty-spring-9.3.jar Normal file
View File

0
jetty-start/src/test/resources/dist-home/lib/websocket/javax-websocket-client-impl-9.3.jar Normal file
View File

0
jetty-start/src/test/resources/dist-home/lib/websocket/javax-websocket-server-impl-9.3.jar Normal file
View File

0
jetty-start/src/test/resources/dist-home/lib/websocket/websocket-api-9.3.jar Normal file
View File

0
jetty-start/src/test/resources/dist-home/lib/websocket/websocket-client-9.3.jar Normal file
View File

0
jetty-start/src/test/resources/dist-home/lib/websocket/websocket-common-9.3.jar Normal file
View File

0
jetty-start/src/test/resources/dist-home/lib/websocket/websocket-server-9.3.jar Normal file
View File

0
jetty-start/src/test/resources/dist-home/lib/websocket/websocket-servlet-9.3.jar Normal file
View File

2
jetty-start/src/test/resources/dist-home/modules/alpn.mod
View File

@ -44,7 +44,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.

20
jetty-start/src/test/resources/dist-home/modules/cdi.mod
View File

@ -10,12 +10,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

2
jetty-start/src/test/resources/dist-home/modules/http.mod
View File

@ -15,7 +15,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

3
jetty-start/src/test/resources/dist-home/modules/https.mod
View File

@ -5,6 +5,9 @@
[depend]
ssl
[optional]
http2
[xml]
etc/jetty-https.xml

35
jetty-start/src/test/resources/dist-home/modules/infinispan.mod Normal file
View File

@ -0,0 +1,35 @@
#
# Jetty Infinispan module
#
[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

27
jetty-start/src/test/resources/dist-home/modules/jdbc-sessions.mod Normal file
View File

@ -0,0 +1,27 @@
#
# Jetty JDBC Session module
#
[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

32
jetty-start/src/test/resources/dist-home/modules/nosql.mod Normal file
View File

@ -0,0 +1,32 @@
#
# Jetty NoSql module
#
[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

39
jetty-start/src/test/resources/dist-home/modules/ssl.mod
View File

@ -1,15 +1,18 @@
#
# SSL Keystore module
#
[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 +21,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 +41,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
## Keystore file path (relative to $jetty.base)
# 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
## Keystore file path (relative to $jetty.base)
# jetty.sslContext.keyStorePath=etc/keystore
## Truststore file path (relative to $jetty.base)
# 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

12
jetty-start/src/test/resources/usecases/agent-properties.assert.txt
View File

@ -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

10
jetty-start/src/test/resources/usecases/barebones.assert.txt
View File

@ -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)

10
jetty-start/src/test/resources/usecases/basic-properties.assert.txt
View File

@ -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)

22
jetty-start/src/test/resources/usecases/database.assert.txt
View File

@ -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

10
jetty-start/src/test/resources/usecases/deep-ext.assert.txt
View File

@ -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

41
jetty-start/src/test/resources/usecases/http2.assert.txt
View File

@ -3,54 +3,39 @@ 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)
PROP|jetty.http.port=9090
PROP|jetty.ssl.port=8443
PROP|java.version=1.7.0_60
PROP|jetty.sslContext.keyStorePath=etc/keystore
PROP|jetty.sslContext.keyStorePassword=friendly
PROP|jetty.sslContext.keyManagerPassword=icecream
PROP|jetty.sslContext.trustStorePath=etc/keystore
PROP|jetty.sslContext.trustStorePassword=sundae
# (these are the ones set by default from jetty.home modules)
PROP|jetty.alpn.debug=false
# PROP|jetty.httpConfig.securePort=8443
# PROP|jetty.ssl.port=8443
# PROP|jetty.ssl.idleTimeout=30000
# PROP|jetty.http.idleTimeout=30000
# PROP|jetty.httpConfig.delayDispatchUntilContent=false
# PROP|jetty.server.dumpAfterStart=false
# PROP|jetty.server.dumpBeforeStop=false
# PROP|jetty.httpConfig.outputBufferSize=32768
# PROP|jetty.httpConfig.requestHeaderSize=8192
# PROP|jetty.httpConfig.responseHeaderSize=8192
# PROP|jetty.httpConfig.sendDateHeader=false
# PROP|jetty.httpConfig.sendServerVersion=true
# PROP|jetty.threadPool.maxThreads=200
# PROP|jetty.threadPool.minThreads=10
# PROP|jetty.threadPool.idleTimeout=60000
# The Downloads
DOWNLOAD|maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
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

12
jetty-start/src/test/resources/usecases/include-jetty-dir-logging.assert.txt
View File

@ -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

12
jetty-start/src/test/resources/usecases/jmx.assert.txt
View File

@ -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)

28
jetty-start/src/test/resources/usecases/jsp.assert.txt
View File

@ -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)

10
jetty-start/src/test/resources/usecases/logging.assert.txt
View File

@ -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

39
jetty-start/src/test/resources/usecases/versioned-modules-too-new/modules/http.mod Normal file
View File

@ -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

10
jetty-start/src/test/resources/usecases/versioned-modules-too-new/modules/http3.mod Normal file
View File

@ -0,0 +1,10 @@
#
# Fake Jetty HTTP/3 Connector
#
[version]
10.0
[depend]
server

6
jetty-start/src/test/resources/usecases/versioned-modules-too-new/start.ini Normal file
View File

@ -0,0 +1,6 @@
--module=server
--module=http
--module=http3
jetty.http.port=9090

16
jetty-start/src/test/resources/usecases/versioned-modules.assert.txt Normal file
View File

@ -0,0 +1,16 @@
# 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

39
jetty-start/src/test/resources/usecases/versioned-modules/modules/http.mod Normal file
View File

@ -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

12
jetty-start/src/test/resources/usecases/versioned-modules/modules/http3.mod Normal file
View File

@ -0,0 +1,12 @@
#
# Fake Jetty HTTP/3 Connector
#
[version]
10.0
[depend]
server
[xml]
etc/jetty-http3.xml

5
jetty-start/src/test/resources/usecases/versioned-modules/start.ini Normal file
View File

@ -0,0 +1,5 @@
--module=server
--module=http
jetty.http.port=9090