Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse McConnell2014-06-09 18:07:22 +0000
committerJesse McConnell2014-06-09 18:07:22 +0000
commit10b6c574aeaf159398313eae6e3d4d3f31336ea0 (patch)
tree58465c294e4d02064e51a48d37ac506ebdcc3af5 /jetty-start
parent2e859e4ae2d5ae821f40931861b7e3bcab6c4751 (diff)
parent0d64434b277865862b2c836f956679068816c134 (diff)
downloadorg.eclipse.jetty.project-10b6c574aeaf159398313eae6e3d4d3f31336ea0.tar.gz
org.eclipse.jetty.project-10b6c574aeaf159398313eae6e3d4d3f31336ea0.tar.xz
org.eclipse.jetty.project-10b6c574aeaf159398313eae6e3d4d3f31336ea0.zip
Merge branch 'master' into release-9
Diffstat (limited to 'jetty-start')
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/FileArg.java30
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/Main.java23
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/Props.java16
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/RawArgs.java97
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java4
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/StartLog.java8
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java12
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/config/ConfigSource.java5
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/config/ConfigSources.java5
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/config/DirConfigSource.java11
-rw-r--r--jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt67
-rw-r--r--jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java2
-rw-r--r--jetty-start/src/test/java/org/eclipse/jetty/start/FileArgTest.java100
-rw-r--r--jetty-start/src/test/resources/usecases/assert-enable-spdy.txt2
-rw-r--r--jetty-start/src/test/resources/usecases/assert-logging.txt10
-rw-r--r--jetty-start/src/test/resources/usecases/base.logging/modules/logging.mod20
-rw-r--r--jetty-start/src/test/resources/usecases/base.logging/resources/jetty-logging.properties2
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_04.mod2
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_05.mod2
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_06.mod2
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_07.mod2
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_09.mod2
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_10.mod2
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_11.mod2
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_13.mod2
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_15.mod2
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_17.mod2
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_21.mod2
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_25.mod2
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_40.mod2
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_45.mod2
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_51.mod2
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_55.mod2
33 files changed, 336 insertions, 110 deletions
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/FileArg.java b/jetty-start/src/main/java/org/eclipse/jetty/start/FileArg.java
index b4515fa310..281fe6bad1 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/FileArg.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/FileArg.java
@@ -23,21 +23,25 @@ public class FileArg
public String uri;
public String location;
- public FileArg(String uriLocation)
+ public FileArg(final String uriLocation)
{
- String parts[] = uriLocation.split(":",3);
- if (parts.length == 3)
+ String parts[] = uriLocation.split("\\|",3);
+ if (parts.length > 2)
{
- if (!"http".equalsIgnoreCase(parts[0]))
- {
- throw new IllegalArgumentException("Download only supports http protocol");
- }
- if (!parts[1].startsWith("//"))
- {
- throw new IllegalArgumentException("Download URI invalid: " + uriLocation);
- }
- this.uri = String.format("%s:%s",parts[0],parts[1]);
- this.location = parts[2];
+ StringBuilder err = new StringBuilder();
+ final String LN = System.lineSeparator();
+ err.append("Unrecognized [file] argument: ").append(uriLocation);
+ err.append(LN).append("Valid Syntaxes: ");
+ err.append(LN).append(" <relative-path> - eg: resources/");
+ err.append(LN).append(" or <absolute-path> - eg: /var/run/jetty.pid");
+ err.append(LN).append(" or <uri>|<relative-path> - eg: http://machine/my.conf|resources/my.conf");
+ err.append(LN).append(" or <uri>|<absolute-path> - eg: http://machine/glob.dat|/opt/run/glob.dat");
+ throw new IllegalArgumentException(err.toString());
+ }
+ if (parts.length == 2)
+ {
+ this.uri = parts[0];
+ this.location = parts[1];
}
else
{
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
index 3831146296..8859cff7d2 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
@@ -375,15 +375,15 @@ public class Main
// Find any named ini file and check it follows the convention
Path start_ini = baseHome.getBasePath("start.ini");
String short_start_ini = baseHome.toShortForm(start_ini);
- Path ini = start_d.resolve(name + ".ini");
- String short_ini = baseHome.toShortForm(ini);
+ Path startd_ini = start_d.resolve(name + ".ini");
+ String short_startd_ini = baseHome.toShortForm(startd_ini);
StartIni module_ini = null;
- if (FS.exists(ini))
+ if (FS.exists(startd_ini))
{
- module_ini = new StartIni(ini);
+ module_ini = new StartIni(startd_ini);
if (module_ini.getLineMatches(Pattern.compile("--module=(.*, *)*" + name)).size() == 0)
{
- StartLog.warn("ERROR: %s is not enabled in %s!",name,short_ini);
+ StartLog.warn("ERROR: %s is not enabled in %s!",name,short_startd_ini);
return;
}
}
@@ -392,7 +392,7 @@ public class Main
boolean has_ini_lines = module.getInitialise().size() > 0;
// If it is not enabled or is transitive with ini template lines or toplevel and doesn't exist
- if (!module.isEnabled() || (transitive && has_ini_lines) || (topLevel && !FS.exists(ini) && !appendStartIni))
+ if (!module.isEnabled() || (transitive && has_ini_lines) || (topLevel && !FS.exists(startd_ini) && !appendStartIni))
{
// File BufferedWriter
BufferedWriter writer = null;
@@ -412,9 +412,9 @@ public class Main
// Create the directory if needed
FS.ensureDirectoryExists(start_d);
FS.ensureDirectoryWritable(start_d);
- source = short_ini;
+ source = short_startd_ini;
StartLog.info("%-15s initialised in %s (created)",name,source);
- writer = Files.newBufferedWriter(ini,StandardCharsets.UTF_8,StandardOpenOption.CREATE_NEW,StandardOpenOption.WRITE);
+ writer = Files.newBufferedWriter(startd_ini,StandardCharsets.UTF_8,StandardOpenOption.CREATE_NEW,StandardOpenOption.WRITE);
out = new PrintWriter(writer);
}
@@ -463,9 +463,9 @@ public class Main
}
}
}
- else if (FS.exists(ini))
+ else if (FS.exists(startd_ini))
{
- StartLog.info("%-15s initialised in %s",name,short_ini);
+ StartLog.info("%-15s initialised in %s",name,short_startd_ini);
}
else
{
@@ -475,7 +475,8 @@ public class Main
// Also list other places this module is enabled
for (String source : module.getSources())
{
- if (!short_ini.equals(source))
+ StartLog.debug("also enabled in: %s",source);
+ if (!short_start_ini.equals(source))
{
StartLog.info("%-15s enabled in %s",name,baseHome.toShortForm(source));
}
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Props.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Props.java
index f760f6e8e2..7d35aaaf4c 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Props.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Props.java
@@ -23,12 +23,12 @@ import static org.eclipse.jetty.start.UsageException.*;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Stack;
+import java.util.TreeMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -98,7 +98,7 @@ public final class Props implements Iterable<Prop>
return l;
}
- private Map<String, Prop> props = new HashMap<>();
+ private Map<String, Prop> props = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
private List<String> sysPropTracking = new ArrayList<>();
public void addAll(Props other)
@@ -114,7 +114,7 @@ public final class Props implements Iterable<Prop>
* @param arg the argument to parse for a potential property
* @param source the source for this argument (to track origin of property from)
*/
- public void addPossibleProperty(String arg, String source)
+ public boolean addPossibleProperty(String arg, String source)
{
// Start property (syntax similar to System property)
if (arg.startsWith("-D"))
@@ -125,15 +125,14 @@ public final class Props implements Iterable<Prop>
case 2:
setSystemProperty(assign[0],assign[1]);
setProperty(assign[0],assign[1],source);
- break;
+ return true;
case 1:
setSystemProperty(assign[0],"");
setProperty(assign[0],"",source);
- break;
+ return true;
default:
- break;
+ return false;
}
- return;
}
// Is this a raw property declaration?
@@ -144,10 +143,11 @@ public final class Props implements Iterable<Prop>
String value = arg.substring(idx + 1);
setProperty(key,value,source);
- return;
+ return true;
}
// All other strings are ignored
+ return false;
}
public String cleanReference(String property)
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/RawArgs.java b/jetty-start/src/main/java/org/eclipse/jetty/start/RawArgs.java
new file mode 100644
index 0000000000..6464a35d17
--- /dev/null
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/RawArgs.java
@@ -0,0 +1,97 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
+// ------------------------------------------------------------------------
+// All rights reserved. This program and the accompanying materials
+// are made available under the terms of the Eclipse Public License v1.0
+// and Apache License v2.0 which accompanies this distribution.
+//
+// The Eclipse Public License is available at
+// http://www.eclipse.org/legal/epl-v10.html
+//
+// The Apache License v2.0 is available at
+// http://www.opensource.org/licenses/apache2.0.php
+//
+// You may elect to redistribute this code under either of these licenses.
+// ========================================================================
+//
+
+package org.eclipse.jetty.start;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.jetty.start.RawArgs.Entry;
+
+public class RawArgs implements Iterable<Entry>
+{
+ public class Entry
+ {
+ private String line;
+ private String origin;
+
+ private Entry(String line, String origin)
+ {
+ this.line = line;
+ this.origin = origin;
+ }
+
+ public String getLine()
+ {
+ return line;
+ }
+
+ public String getOrigin()
+ {
+ return origin;
+ }
+
+ public boolean startsWith(String val)
+ {
+ return line.startsWith(val);
+ }
+ }
+
+ /**
+ * All of the args, in argument order
+ */
+ private List<Entry> args = new ArrayList<>();
+
+ public void addAll(List<String> lines, Path sourceFile)
+ {
+ String source = sourceFile.toAbsolutePath().toString();
+ for (String line : lines)
+ {
+ addArg(line,source);
+ }
+ }
+
+ public void addArg(final String rawline, final String source)
+ {
+ if (rawline == null)
+ {
+ return;
+ }
+
+ String line = rawline.trim();
+ if (line.length() == 0)
+ {
+ return;
+ }
+
+ args.add(new Entry(line,source));
+ }
+
+ @Override
+ public Iterator<Entry> iterator()
+ {
+ return args.iterator();
+ }
+
+ public int size()
+ {
+ return args.size();
+ }
+}
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
index d1e6623ad0..43df38122a 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
@@ -639,9 +639,9 @@ public class StartArgs
while (iter.hasPrevious())
{
ConfigSource source = iter.previous();
- for (String arg : source.getArgs())
+ for (RawArgs.Entry arg : source.getArgs())
{
- parse(arg,source.getId());
+ parse(arg.getLine(),arg.getOrigin());
}
}
}
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/StartLog.java b/jetty-start/src/main/java/org/eclipse/jetty/start/StartLog.java
index 963433c65e..e7acfa13c1 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/StartLog.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/StartLog.java
@@ -96,9 +96,9 @@ public class StartLog
String logFileName = cmdLineSource.getProperty("start-log-file");
- for (String arg : cmdLineSource.getArgs())
+ for (RawArgs.Entry arg : cmdLineSource.getArgs())
{
- if ("--debug".equals(arg))
+ if ("--debug".equals(arg.getLine()))
{
debug = true;
continue;
@@ -106,14 +106,14 @@ public class StartLog
if (arg.startsWith("--start-log-file"))
{
- logFileName = Props.getValue(arg);
+ logFileName = Props.getValue(arg.getLine());
continue;
}
}
if (logFileName != null)
{
- Path logfile = baseHome.getBasePath(logFileName);
+ Path logfile = baseHome.getPath(logFileName);
initLogFile(logfile);
}
}
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java b/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java
index 61f9f643f1..934158f1ac 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java
@@ -23,8 +23,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -32,6 +30,7 @@ import org.eclipse.jetty.start.BaseHome;
import org.eclipse.jetty.start.FS;
import org.eclipse.jetty.start.Props;
import org.eclipse.jetty.start.Props.Prop;
+import org.eclipse.jetty.start.RawArgs;
import org.eclipse.jetty.start.UsageException;
/**
@@ -42,17 +41,18 @@ public class CommandLineConfigSource implements ConfigSource
public static final String ORIGIN_INTERNAL_FALLBACK = "<internal-fallback>";
public static final String ORIGIN_CMD_LINE = "<command-line>";
- private final List<String> args;
+ private final RawArgs args;
private final Props props;
private final Path homePath;
private final Path basePath;
public CommandLineConfigSource(String rawargs[])
{
- this.args = Arrays.asList(rawargs);
+ this.args = new RawArgs();
this.props = new Props();
- for (String arg : args)
+ for (String arg : rawargs)
{
+ this.args.addArg(arg,ORIGIN_CMD_LINE);
this.props.addPossibleProperty(arg,ORIGIN_CMD_LINE);
}
@@ -179,7 +179,7 @@ public class CommandLineConfigSource implements ConfigSource
}
@Override
- public List<String> getArgs()
+ public RawArgs getArgs()
{
return args;
}
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/config/ConfigSource.java b/jetty-start/src/main/java/org/eclipse/jetty/start/config/ConfigSource.java
index 47abc1745d..ba81a2a6c9 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/config/ConfigSource.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/config/ConfigSource.java
@@ -18,9 +18,8 @@
package org.eclipse.jetty.start.config;
-import java.util.List;
-
import org.eclipse.jetty.start.Props;
+import org.eclipse.jetty.start.RawArgs;
/**
* A Configuration Source
@@ -57,7 +56,7 @@ public interface ConfigSource
*
* @return the list of Arguments for this ConfigSource
*/
- public List<String> getArgs();
+ public RawArgs getArgs();
/**
* The properties for this ConfigSource
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/config/ConfigSources.java b/jetty-start/src/main/java/org/eclipse/jetty/start/config/ConfigSources.java
index 4eb3713ccc..7bd3780357 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/config/ConfigSources.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/config/ConfigSources.java
@@ -31,6 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.jetty.start.FS;
import org.eclipse.jetty.start.Props;
+import org.eclipse.jetty.start.RawArgs;
import org.eclipse.jetty.start.Props.Prop;
import org.eclipse.jetty.start.UsageException;
@@ -67,11 +68,11 @@ public class ConfigSources implements Iterable<ConfigSource>
updateProps();
// look for --include-jetty-dir entries
- for (String arg : source.getArgs())
+ for (RawArgs.Entry arg : source.getArgs())
{
if (arg.startsWith("--include-jetty-dir"))
{
- String ref = getValue(arg);
+ String ref = getValue(arg.getLine());
String dirName = props.expand(ref);
Path dir = FS.toPath(dirName);
DirConfigSource dirsource = new DirConfigSource(ref,dir,sourceWeight.incrementAndGet(),true);
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/config/DirConfigSource.java b/jetty-start/src/main/java/org/eclipse/jetty/start/config/DirConfigSource.java
index 9befbe8d98..589905c9ef 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/config/DirConfigSource.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/config/DirConfigSource.java
@@ -33,6 +33,7 @@ import org.eclipse.jetty.start.FS;
import org.eclipse.jetty.start.NaturalSort;
import org.eclipse.jetty.start.PathMatchers;
import org.eclipse.jetty.start.Props;
+import org.eclipse.jetty.start.RawArgs;
import org.eclipse.jetty.start.UsageException;
import org.eclipse.jetty.start.Props.Prop;
import org.eclipse.jetty.start.StartIni;
@@ -71,7 +72,7 @@ public class DirConfigSource implements ConfigSource
private final String id;
private final Path dir;
private final int weight;
- private final List<String> args;
+ private final RawArgs args;
private final Props props;
/**
@@ -95,7 +96,7 @@ public class DirConfigSource implements ConfigSource
this.weight = weight;
this.props = new Props();
- this.args = new ArrayList<>();
+ this.args = new RawArgs();
if (canHaveArgs)
{
@@ -103,7 +104,7 @@ public class DirConfigSource implements ConfigSource
if (FS.canReadFile(iniFile))
{
StartIni ini = new StartIni(iniFile);
- args.addAll(ini.getLines());
+ args.addAll(ini.getLines(),iniFile);
parseAllArgs(ini.getLines(),iniFile.toString());
}
@@ -138,7 +139,7 @@ public class DirConfigSource implements ConfigSource
{
StartLog.debug("Reading %s/start.d/%s - %s",id,diniFile.getFileName(),diniFile);
StartIni ini = new StartIni(diniFile);
- args.addAll(ini.getLines());
+ args.addAll(ini.getLines(),diniFile);
parseAllArgs(ini.getLines(),diniFile.toString());
}
}
@@ -194,7 +195,7 @@ public class DirConfigSource implements ConfigSource
}
@Override
- public List<String> getArgs()
+ public RawArgs getArgs()
{
return args;
}
diff --git a/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt b/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
index 7f818effcb..0817b46738 100644
--- a/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
+++ b/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
@@ -98,6 +98,7 @@ Module Management:
modules. This may download a file from the network if the
module provides a URL.
+
Startup / Shutdown Command Line:
--------------------------------
@@ -120,44 +121,26 @@ Properties:
Jetty server has stopped. If not specified, the stopper will wait
indefinitely. Use in conjunction with the --stop option.
+
Advanced Commands:
------------------
- --download=<http-uri>:<location>
- Advanced usage, If the file does not exist at the given
- location, download it from the given http URI.
- Note: location is always relative to ${jetty.base}
-
--lib=<classpath>
Add arbitrary classpath entries to the the server classpath.
-
-System Properties:
-------------------
-
- These are set with a command line like "java -Dname=value ..." and are
- accessible via the java.lang.System#getProperty(String) API.
- Some key system properties are:
-
- org.eclipse.jetty.util.log.class=[class]
- A Low Level Jetty Logger Implementation to use
- (default: org.eclipse.jetty.util.log.Slf4jLog)
-
- [name|hierarchy].LEVEL=[loglevel]
- Change loglevel for the stderr and javautil Loggers. Slf4j
- and other loggers must be separately configured for debug.
- For example: Dorg.eclipse.jetty.LEVEL=DEBUG
- (default: INFO)
-
- org.eclipse.jetty.util.log.IGNORED=[boolean]
- Ignored exceptions are logged, independent of DEBUG settings
- (default: false)
-
- org.eclipse.jetty.util.log.SOURCE=[boolean]
- The source location of logs is logged in the stderr Logger.
- (default: false)
-
- com.sun.management.jmxremote
- Enable remote JMX management in Sun JVMS.
+
+ --include-jetty-dir=<path>
+ Include an extra jetty directory to use as a source
+ for configuration details. This directory behaves similarly
+ to ${jetty.base} but sits at a layer between ${jetty.base}
+ and ${jetty.home}. This allows for some complex hierarchies
+ of configuration details.
+
+ --download=<http-uri>|<location>
+ Advanced usage, If the file does not exist at the given
+ location, download it from the given http URI.
+ Notes: location is always relative to ${jetty.base}.
+ you might need to escape the slash "\|" to use
+ this on some environments.
Properties:
@@ -180,6 +163,18 @@ Properties:
Defaults:
---------
- A ${jetty.base}/start.ini file and/or ${jetty.base|/start.d/*.ini files may be
- used to specify default arguments to start.jar. In case of a conflict between
- the command line, and ini files, the command line will win.
+ Command line arguments can come from any jetty configuration directory
+ (except ${jetty.home}), such as ${jetty.base} and any added jetty directories
+ (see --include-jetty-dir=<path>).
+ The contents of <path>/start.ini and <path>/start.d/*.ini are all used
+ to build up your command line arguments.
+ In case of a conflict, the resolution of who wins, will look like this.
+
+ 1) <command-line itself>
+ 2) ${jetty.base}/start.ini
+ 3) ${jetty.base}/start.d/*.ini
+ 4) <jetty-dir>/start.ini
+ 5) <jetty-dir>/start.d/*.ini
+
+For more information on startup, see the online documentation at
+ http://www.eclipse.org/jetty/documentation/
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java b/jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
index ced1889b5c..1d2e8ba1d0 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
@@ -124,7 +124,7 @@ public class ConfigurationAssert
{
if (darg.uri != null)
{
- actualDownloads.add(String.format("%s:%s",darg.uri,darg.location));
+ actualDownloads.add(String.format("%s|%s",darg.uri,darg.location));
}
}
assertContainsUnordered("Downloads",expectedDownloads,actualDownloads);
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/FileArgTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/FileArgTest.java
new file mode 100644
index 0000000000..e35657c49f
--- /dev/null
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/FileArgTest.java
@@ -0,0 +1,100 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
+// ------------------------------------------------------------------------
+// All rights reserved. This program and the accompanying materials
+// are made available under the terms of the Eclipse Public License v1.0
+// and Apache License v2.0 which accompanies this distribution.
+//
+// The Eclipse Public License is available at
+// http://www.eclipse.org/legal/epl-v10.html
+//
+// The Apache License v2.0 is available at
+// http://www.opensource.org/licenses/apache2.0.php
+//
+// You may elect to redistribute this code under either of these licenses.
+// ========================================================================
+//
+
+package org.eclipse.jetty.start;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class FileArgTest
+{
+ @SuppressWarnings("serial")
+ private static class UseCases extends ArrayList<String[]>
+ {
+ public void add(String rawfileref, String expectedUri, String expectedLocation)
+ {
+ this.add(new String[] { rawfileref, expectedUri, expectedLocation });
+ }
+ }
+
+ @Parameters(name = "{0}")
+ public static List<String[]> data()
+ {
+ UseCases data = new UseCases();
+ data.add("resource",null,"resource");
+ data.add("lib/logging",null,"lib/logging");
+
+ // -- URI with relative location --
+ data.add("http://machine.com/my.conf|resources/my.conf","http://machine.com/my.conf","resources/my.conf");
+ data.add("http://machine.com:8080/my.conf|resources/my.conf","http://machine.com:8080/my.conf","resources/my.conf");
+ data.add("https://machine.com:8080/my.conf|resources/my.conf","https://machine.com:8080/my.conf","resources/my.conf");
+ // Windows URI (drive mapped)
+ data.add("file:///Z:/share/my.conf|resources/my.conf","file:///Z:/share/my.conf","resources/my.conf");
+ // Windows URI (network share)
+ data.add("file:////nas/share/my.conf|resources/my.conf","file:////nas/share/my.conf","resources/my.conf");
+
+ // -- URI with absolute location --
+ data.add("http://machine.com/db.dat|/var/run/db.dat","http://machine.com/db.dat","/var/run/db.dat");
+ data.add("http://machine.com:8080/b/db.dat|/var/run/db.dat","http://machine.com:8080/b/db.dat","/var/run/db.dat");
+ data.add("https://machine.com:8080/c/db.dat|/var/run/db.dat","https://machine.com:8080/c/db.dat","/var/run/db.dat");
+ // Windows URI (drive mapped) to drive mapped output
+ data.add("file:///Z:/share/my.conf|C:/db/db.dat","file:///Z:/share/my.conf","C:/db/db.dat");
+ data.add("file:///Z:/share/my.conf|C:\\db\\db.dat","file:///Z:/share/my.conf","C:\\db\\db.dat");
+ // Windows URI (drive mapped) to network share output
+ data.add("file:///Z:/share/my.conf|\\\\nas\\apps\\db\\db.dat","file:///Z:/share/my.conf","\\\\nas\\apps\\db\\db.dat");
+ // Windows URI (network share) to drive mapped output
+ data.add("file:////nas/share/my.conf|C:/db/db.dat","file:////nas/share/my.conf","C:/db/db.dat");
+ data.add("file:////nas/share/my.conf|C:\\db\\db.dat","file:////nas/share/my.conf","C:\\db\\db.dat");
+ // Windows URI (network share) to network share output
+ data.add("file:////nas/share/my.conf|\\\\nas\\apps\\db\\db.dat","file:////nas/share/my.conf","\\\\nas\\apps\\db\\db.dat");
+ return data;
+ }
+
+ @Parameter(value = 0)
+ public String rawFileRef;
+ @Parameter(value = 1)
+ public String expectedUri;
+ @Parameter(value = 2)
+ public String expectedLocation;
+
+ @Test
+ public void testFileArg()
+ {
+ FileArg arg = new FileArg(rawFileRef);
+ if (expectedUri == null)
+ {
+ assertThat("URI",arg.uri,nullValue());
+ }
+ else
+ {
+ assertThat("URI",arg.uri,is(expectedUri));
+ }
+ assertThat("Location",arg.location,is(expectedLocation));
+ }
+
+}
diff --git a/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt b/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt
index 6b0cc7b5bf..b097f5d12f 100644
--- a/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt
+++ b/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt
@@ -31,7 +31,7 @@ PROP|jetty.truststore.password=sundae
PROP|java.version=1.7.0_21
# The Downloads
-DOWNLOAD|http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar:lib/npn/npn-boot-1.1.5.v20130313.jar
+DOWNLOAD|http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar
# The Bootlib
BOOTLIB|-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar
diff --git a/jetty-start/src/test/resources/usecases/assert-logging.txt b/jetty-start/src/test/resources/usecases/assert-logging.txt
index b566172b27..c83dc2c7b9 100644
--- a/jetty-start/src/test/resources/usecases/assert-logging.txt
+++ b/jetty-start/src/test/resources/usecases/assert-logging.txt
@@ -1,5 +1,4 @@
# The XMLs we expect (order is important)
-XML|${jetty.home}/etc/jetty-logging.xml
XML|${jetty.home}/etc/jetty.xml
XML|${jetty.home}/etc/jetty-http.xml
@@ -23,4 +22,11 @@ PROP|jetty.port=9090
# Other File References
FILE|logs/
-FILE|resources/ \ No newline at end of file
+FILE|resources/
+
+# Downloads
+DOWNLOAD|http://central.maven.org/maven2/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar|lib/logging/slf4j-api-1.6.6.jar
+DOWNLOAD|http://repo1.maven.org/maven2/ch/qos/logback/logback-core/1.0.7/logback-core-1.0.7.jar|lib/logging/logback-core-1.0.7.jar
+DOWNLOAD|http://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.0.7/logback-classic-1.0.7.jar|lib/logging/logback-classic-1.0.7.jar
+DOWNLOAD|https://raw.githubusercontent.com/jetty-project/logging-modules/master/logback/logback.xml|resources/logback.xml
+DOWNLOAD|https://raw.githubusercontent.com/jetty-project/logging-modules/master/logback/jetty-logging.properties|resources/jetty-logging.properties
diff --git a/jetty-start/src/test/resources/usecases/base.logging/modules/logging.mod b/jetty-start/src/test/resources/usecases/base.logging/modules/logging.mod
new file mode 100644
index 0000000000..e2d24ce645
--- /dev/null
+++ b/jetty-start/src/test/resources/usecases/base.logging/modules/logging.mod
@@ -0,0 +1,20 @@
+#
+# Jetty with logback logging
+#
+
+[depend]
+resources
+
+[files]
+logs/
+resources/
+http://central.maven.org/maven2/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar|lib/logging/slf4j-api-1.6.6.jar
+http://repo1.maven.org/maven2/ch/qos/logback/logback-core/1.0.7/logback-core-1.0.7.jar|lib/logging/logback-core-1.0.7.jar
+http://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.0.7/logback-classic-1.0.7.jar|lib/logging/logback-classic-1.0.7.jar
+https://raw.githubusercontent.com/jetty-project/logging-modules/master/logback/logback.xml|resources/logback.xml
+https://raw.githubusercontent.com/jetty-project/logging-modules/master/logback/jetty-logging.properties|resources/jetty-logging.properties
+
+[lib]
+lib/logging/**.jar
+resources/
+
diff --git a/jetty-start/src/test/resources/usecases/base.logging/resources/jetty-logging.properties b/jetty-start/src/test/resources/usecases/base.logging/resources/jetty-logging.properties
new file mode 100644
index 0000000000..5cb8291a81
--- /dev/null
+++ b/jetty-start/src/test/resources/usecases/base.logging/resources/jetty-logging.properties
@@ -0,0 +1,2 @@
+# Configure Jetty for SLf4j Logging
+org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog \ No newline at end of file
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_04.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_04.mod
index 14bed1bc86..a677822246 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_04.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_04.mod
@@ -2,7 +2,7 @@
npn-boot
[files]
-http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.0.v20120525/npn-boot-1.1.0.v20120525.jar:lib/npn/npn-boot-1.1.0.v20120525.jar
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.0.v20120525/npn-boot-1.1.0.v20120525.jar|lib/npn/npn-boot-1.1.0.v20120525.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.0.v20120525.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_05.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_05.mod
index 14bed1bc86..a677822246 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_05.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_05.mod
@@ -2,7 +2,7 @@
npn-boot
[files]
-http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.0.v20120525/npn-boot-1.1.0.v20120525.jar:lib/npn/npn-boot-1.1.0.v20120525.jar
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.0.v20120525/npn-boot-1.1.0.v20120525.jar|lib/npn/npn-boot-1.1.0.v20120525.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.0.v20120525.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_06.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_06.mod
index 9ca93c3fd8..bb6b64bf1f 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_06.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_06.mod
@@ -2,7 +2,7 @@
npn-boot
[files]
-http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.1.v20121030/npn-boot-1.1.1.v20121030.jar:lib/npn/npn-boot-1.1.1.v20121030.jar
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.1.v20121030/npn-boot-1.1.1.v20121030.jar|lib/npn/npn-boot-1.1.1.v20121030.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.1.v20121030.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_07.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_07.mod
index 9ca93c3fd8..bb6b64bf1f 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_07.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_07.mod
@@ -2,7 +2,7 @@
npn-boot
[files]
-http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.1.v20121030/npn-boot-1.1.1.v20121030.jar:lib/npn/npn-boot-1.1.1.v20121030.jar
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.1.v20121030/npn-boot-1.1.1.v20121030.jar|lib/npn/npn-boot-1.1.1.v20121030.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.1.v20121030.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_09.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_09.mod
index 2a286fc595..c488457f14 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_09.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_09.mod
@@ -2,7 +2,7 @@
npn-boot
[files]
-http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.3.v20130313/npn-boot-1.1.3.v20130313.jar:lib/npn/npn-boot-1.1.3.v20130313.jar
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.3.v20130313/npn-boot-1.1.3.v20130313.jar|lib/npn/npn-boot-1.1.3.v20130313.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.3.v20130313.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_10.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_10.mod
index 2a286fc595..c488457f14 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_10.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_10.mod
@@ -2,7 +2,7 @@
npn-boot
[files]
-http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.3.v20130313/npn-boot-1.1.3.v20130313.jar:lib/npn/npn-boot-1.1.3.v20130313.jar
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.3.v20130313/npn-boot-1.1.3.v20130313.jar|lib/npn/npn-boot-1.1.3.v20130313.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.3.v20130313.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_11.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_11.mod
index 2a286fc595..c488457f14 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_11.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_11.mod
@@ -2,7 +2,7 @@
npn-boot
[files]
-http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.3.v20130313/npn-boot-1.1.3.v20130313.jar:lib/npn/npn-boot-1.1.3.v20130313.jar
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.3.v20130313/npn-boot-1.1.3.v20130313.jar|lib/npn/npn-boot-1.1.3.v20130313.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.3.v20130313.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_13.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_13.mod
index 0af092a8da..0264d72486 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_13.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_13.mod
@@ -2,7 +2,7 @@
npn-boot
[files]
-http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.4.v20130313/npn-boot-1.1.4.v20130313.jar:lib/npn/npn-boot-1.1.4.v20130313.jar
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.4.v20130313/npn-boot-1.1.4.v20130313.jar|lib/npn/npn-boot-1.1.4.v20130313.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.4.v20130313.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_15.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_15.mod
index 572d69fbce..d2d09ea2d6 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_15.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_15.mod
@@ -2,7 +2,7 @@
npn-boot
[files]
-http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar:lib/npn/npn-boot-1.1.5.v20130313.jar
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_17.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_17.mod
index 572d69fbce..d2d09ea2d6 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_17.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_17.mod
@@ -2,7 +2,7 @@
npn-boot
[files]
-http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar:lib/npn/npn-boot-1.1.5.v20130313.jar
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_21.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_21.mod
index 572d69fbce..d2d09ea2d6 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_21.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_21.mod
@@ -2,7 +2,7 @@
npn-boot
[files]
-http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar:lib/npn/npn-boot-1.1.5.v20130313.jar
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_25.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_25.mod
index 572d69fbce..d2d09ea2d6 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_25.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_25.mod
@@ -2,7 +2,7 @@
npn-boot
[files]
-http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar:lib/npn/npn-boot-1.1.5.v20130313.jar
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_40.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_40.mod
index 78b7f7c8de..909bebf5f7 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_40.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_40.mod
@@ -2,7 +2,7 @@
npn-boot
[files]
-http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.6.v20130911/npn-boot-1.1.6.v20130911.jar:lib/npn/npn-boot-1.1.6.v20130911.jar
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.6.v20130911/npn-boot-1.1.6.v20130911.jar|lib/npn/npn-boot-1.1.6.v20130911.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.6.v20130911.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_45.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_45.mod
index 78b7f7c8de..909bebf5f7 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_45.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_45.mod
@@ -2,7 +2,7 @@
npn-boot
[files]
-http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.6.v20130911/npn-boot-1.1.6.v20130911.jar:lib/npn/npn-boot-1.1.6.v20130911.jar
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.6.v20130911/npn-boot-1.1.6.v20130911.jar|lib/npn/npn-boot-1.1.6.v20130911.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.6.v20130911.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_51.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_51.mod
index 78b7f7c8de..909bebf5f7 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_51.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_51.mod
@@ -2,7 +2,7 @@
npn-boot
[files]
-http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.6.v20130911/npn-boot-1.1.6.v20130911.jar:lib/npn/npn-boot-1.1.6.v20130911.jar
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.6.v20130911/npn-boot-1.1.6.v20130911.jar|lib/npn/npn-boot-1.1.6.v20130911.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.6.v20130911.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_55.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_55.mod
index 02c2fbdf0b..6f6b425080 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_55.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_55.mod
@@ -2,7 +2,7 @@
npn-boot
[files]
-http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar:lib/npn/npn-boot-1.1.7.v20140316.jar
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar

Back to the top