Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2014-06-04 00:09:48 +0000
committerJoakim Erdfelt2014-06-04 00:09:48 +0000
commitbbab2e7832cd0afea433689847107ff4b7182aab (patch)
treee3c313ab2c02d3c149060d767a10f81a768a8203 /jetty-start
parentcfe99742d9b0bd086f9f1d9e18a64f5e14e289b4 (diff)
downloadorg.eclipse.jetty.project-bbab2e7832cd0afea433689847107ff4b7182aab.tar.gz
org.eclipse.jetty.project-bbab2e7832cd0afea433689847107ff4b7182aab.tar.xz
org.eclipse.jetty.project-bbab2e7832cd0afea433689847107ff4b7182aab.zip
436524 - Start / Downloadable [files] references in modules cannot use ":" themselves
+ Switching out support for ":" to "|"
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/test/java/org/eclipse/jetty/start/FileArgTest.java100
-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
18 files changed, 133 insertions, 29 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/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/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