Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2014-05-08 22:05:28 +0000
committerJoakim Erdfelt2014-05-08 22:05:28 +0000
commitb7b29ca4a3c53b4a0367f771ae595e94332b2ee7 (patch)
treeb98dfb52fc8d8f73b80ac0721e4ed09c7cbddcf7 /jetty-start
parentf9fad8f49f1b13f50dfc3f13f6ae96e7829bc335 (diff)
downloadorg.eclipse.jetty.project-b7b29ca4a3c53b4a0367f771ae595e94332b2ee7.tar.gz
org.eclipse.jetty.project-b7b29ca4a3c53b4a0367f771ae595e94332b2ee7.tar.xz
org.eclipse.jetty.project-b7b29ca4a3c53b4a0367f771ae595e94332b2ee7.zip
432321 - jetty-start / Allow defining extra start directories for common configurations
+ renaming --extra-start-dir=<path> to --include-jetty-dir=<path>
Diffstat (limited to 'jetty-start')
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/BaseHome.java2
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java2
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/config/ConfigSource.java4
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/config/ConfigSources.java8
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/config/DirConfigSource.java2
-rw-r--r--jetty-start/src/test/java/org/eclipse/jetty/start/IncludeJettyDirTest.java (renamed from jetty-start/src/test/java/org/eclipse/jetty/start/ExtraStartTest.java)52
-rw-r--r--jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java4
-rw-r--r--jetty-start/src/test/java/org/eclipse/jetty/start/config/ConfigSourcesTest.java46
-rw-r--r--jetty-start/src/test/resources/extra-jetty-dirs/logging/etc/jetty-logging.xml (renamed from jetty-start/src/test/resources/extra-start-dirs/logging/etc/jetty-logging.xml)0
-rw-r--r--jetty-start/src/test/resources/extra-jetty-dirs/logging/lib/logging/logback.jar (renamed from jetty-start/src/test/resources/extra-start-dirs/logging/lib/logging/logback.jar)0
-rw-r--r--jetty-start/src/test/resources/extra-jetty-dirs/logging/start.ini (renamed from jetty-start/src/test/resources/extra-start-dirs/logging/start.ini)0
-rw-r--r--jetty-start/src/test/resources/extra-jetty-dirs/more-startd/start.d/more.ini (renamed from jetty-start/src/test/resources/extra-start-dirs/more-startd/start.d/more.ini)0
-rw-r--r--jetty-start/src/test/resources/usecases/assert-include-jetty-dir-logging.txt (renamed from jetty-start/src/test/resources/usecases/assert-extra-start-dir-logging.txt)0
-rw-r--r--jetty-start/src/test/resources/usecases/base.with.extra.start.dirs/start.ini5
-rw-r--r--jetty-start/src/test/resources/usecases/base.with.include.jetty.dirs/start.ini5
15 files changed, 65 insertions, 65 deletions
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/BaseHome.java b/jetty-start/src/main/java/org/eclipse/jetty/start/BaseHome.java
index 70ca6bebd5..99f8e9803b 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/BaseHome.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/BaseHome.java
@@ -222,7 +222,7 @@ public class BaseHome
* <ol>
* <li>If provided path is an absolute reference., and exists, return that reference</li>
* <li>If exists relative to <code>${jetty.base}</code>, return that reference</li>
- * <li>If exists relative to and <code>extra-start-dir</code> locations, return that reference</li>
+ * <li>If exists relative to and <code>include-jetty-dir</code> locations, return that reference</li>
* <li>If exists relative to <code>${jetty.home}</code>, return that reference</li>
* <li>Return standard {@link Path} reference obtained from {@link java.nio.file.FileSystem#getPath(String, String...)} (no exists check performed)</li>
* </ol>
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 0a433806f5..0ca8c09ef7 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
@@ -651,7 +651,7 @@ public class StartArgs
return;
}
- if (arg.startsWith("--extra-start-dir="))
+ if (arg.startsWith("--include-jetty-dir="))
{
// valid, but handled in ConfigSources instead
return;
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 499013f1e4..47abc1745d 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
@@ -43,8 +43,8 @@ public interface ConfigSource
* <pre>
* -1 = the command line
* 0 = the ${jetty.base} source
- * [1..n] = extra-start-dir entries from command line
- * [n+1..n] = extra-start-dir entries from start.ini (or start.d/*.ini)
+ * [1..n] = include-jetty-dir entries from command line
+ * [n+1..n] = include-jetty-dir entries from start.ini (or start.d/*.ini)
* 9999999 = the ${jetty.home} source
* </pre>
*
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 5f5843e7d2..4eb3713ccc 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
@@ -51,7 +51,7 @@ public class ConfigSources implements Iterable<ConfigSource>
private LinkedList<ConfigSource> sources = new LinkedList<>();
private Props props = new Props();
- private AtomicInteger xtraSourceWeight = new AtomicInteger(1);
+ private AtomicInteger sourceWeight = new AtomicInteger(1);
public void add(ConfigSource source) throws IOException
{
@@ -66,15 +66,15 @@ public class ConfigSources implements Iterable<ConfigSource>
updateProps();
- // look for --extra-start-dir entries
+ // look for --include-jetty-dir entries
for (String arg : source.getArgs())
{
- if (arg.startsWith("--extra-start-dir"))
+ if (arg.startsWith("--include-jetty-dir"))
{
String ref = getValue(arg);
String dirName = props.expand(ref);
Path dir = FS.toPath(dirName);
- DirConfigSource dirsource = new DirConfigSource(ref,dir,xtraSourceWeight.incrementAndGet(),true);
+ DirConfigSource dirsource = new DirConfigSource(ref,dir,sourceWeight.incrementAndGet(),true);
add(dirsource);
}
}
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 b3a818c3bf..9befbe8d98 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
@@ -41,7 +41,7 @@ import org.eclipse.jetty.start.StartLog;
/**
* A Directory based {@link ConfigSource}.
* <p>
- * Such as <code>${jetty.base}</code> or and <code>--extra-start-dir=[path]</code> sources.
+ * Such as <code>${jetty.base}</code> or and <code>--include-jetty-dir=[path]</code> sources.
*/
public class DirConfigSource implements ConfigSource
{
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/ExtraStartTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/IncludeJettyDirTest.java
index 0b41045d49..133d8a24b5 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/ExtraStartTest.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/IncludeJettyDirTest.java
@@ -34,7 +34,7 @@ import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
-public class ExtraStartTest
+public class IncludeJettyDirTest
{
private static class MainResult
{
@@ -97,7 +97,7 @@ public class ExtraStartTest
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1");
- // Simple command line - no reference to extra-start-dirs
+ // Simple command line - no reference to include-jetty-dirs
MainResult result = runMain(base,home);
List<String> expectedSearchOrder = new ArrayList<>();
@@ -127,10 +127,10 @@ public class ExtraStartTest
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1");
- // Simple command line reference to extra-start-dir
+ // Simple command line reference to include-jetty-dir
MainResult result = runMain(base,home,
// direct reference via path
- "--extra-start-dir=" + common.getAbsolutePath());
+ "--include-jetty-dir=" + common.getAbsolutePath());
List<String> expectedSearchOrder = new ArrayList<>();
expectedSearchOrder.add("${jetty.base}");
@@ -161,12 +161,12 @@ public class ExtraStartTest
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1");
- // Simple command line reference to extra-start-dir via property (also on command line)
+ // Simple command line reference to include-jetty-dir via property (also on command line)
MainResult result = runMain(base,home,
// property
"my.common=" + common.getAbsolutePath(),
// reference via property
- "--extra-start-dir=${my.common}");
+ "--include-jetty-dir=${my.common}");
List<String> expectedSearchOrder = new ArrayList<>();
expectedSearchOrder.add("${jetty.base}");
@@ -203,12 +203,12 @@ public class ExtraStartTest
String dirRef = "${my.opt}" + File.separator + "common";
- // Simple command line reference to extra-start-dir via property (also on command line)
+ // Simple command line reference to include-jetty-dir via property (also on command line)
MainResult result = runMain(base,home,
// property to 'opt' dir
"my.opt=" + opt.getAbsolutePath(),
// reference via property prefix
- "--extra-start-dir=" + dirRef);
+ "--include-jetty-dir=" + dirRef);
List<String> expectedSearchOrder = new ArrayList<>();
expectedSearchOrder.add("${jetty.base}");
@@ -245,14 +245,14 @@ public class ExtraStartTest
String dirRef = "${my.opt}" + File.separator + "${my.dir}";
- // Simple command line reference to extra-start-dir via property (also on command line)
+ // Simple command line reference to include-jetty-dir via property (also on command line)
MainResult result = runMain(base,home,
// property to 'opt' dir
"my.opt=" + opt.getAbsolutePath(),
// property to commmon dir name
"my.dir=common",
// reference via property prefix
- "--extra-start-dir=" + dirRef);
+ "--include-jetty-dir=" + dirRef);
List<String> expectedSearchOrder = new ArrayList<>();
expectedSearchOrder.add("${jetty.base}");
@@ -282,7 +282,7 @@ public class ExtraStartTest
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",//
- "--extra-start-dir=" + common.getAbsolutePath());
+ "--include-jetty-dir=" + common.getAbsolutePath());
MainResult result = runMain(base,home);
@@ -318,8 +318,8 @@ public class ExtraStartTest
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",//
- "--extra-start-dir=" + common.getAbsolutePath(), //
- "--extra-start-dir=" + corp.getAbsolutePath());
+ "--include-jetty-dir=" + common.getAbsolutePath(), //
+ "--include-jetty-dir=" + corp.getAbsolutePath());
MainResult result = runMain(base,home);
@@ -351,7 +351,7 @@ public class ExtraStartTest
File common = testdir.getFile("common");
FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", //
- "--extra-start-dir=" + corp.getAbsolutePath(), //
+ "--include-jetty-dir=" + corp.getAbsolutePath(), //
"jetty.port=8080");
// Create base
@@ -359,7 +359,7 @@ public class ExtraStartTest
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",//
- "--extra-start-dir=" + common.getAbsolutePath());
+ "--include-jetty-dir=" + common.getAbsolutePath());
MainResult result = runMain(base,home);
@@ -393,7 +393,7 @@ public class ExtraStartTest
FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", //
"my.corp=" + corp.getAbsolutePath(), //
- "--extra-start-dir=${my.corp}", //
+ "--include-jetty-dir=${my.corp}", //
"jetty.port=8080");
// Create base
@@ -402,7 +402,7 @@ public class ExtraStartTest
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",//
"my.common=" + common.getAbsolutePath(), //
- "--extra-start-dir=${my.common}");
+ "--include-jetty-dir=${my.common}");
MainResult result = runMain(base,home);
@@ -442,7 +442,7 @@ public class ExtraStartTest
File common = testdir.getFile("common");
FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", //
- "--extra-start-dir=" + corp.getAbsolutePath(), //
+ "--include-jetty-dir=" + corp.getAbsolutePath(), //
"jetty.port=8080");
// Create base
@@ -450,11 +450,11 @@ public class ExtraStartTest
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",//
- "--extra-start-dir=" + common.getAbsolutePath());
+ "--include-jetty-dir=" + common.getAbsolutePath());
MainResult result = runMain(base,home,
- // command line provided extra-start-dir ref
- "--extra-start-dir=" + devops.getAbsolutePath());
+ // command line provided include-jetty-dir ref
+ "--include-jetty-dir=" + devops.getAbsolutePath());
List<String> expectedSearchOrder = new ArrayList<>();
expectedSearchOrder.add("${jetty.base}");
@@ -486,7 +486,7 @@ public class ExtraStartTest
File common = testdir.getFile("common");
FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", //
- "--extra-start-dir=" + corp.getAbsolutePath(), //
+ "--include-jetty-dir=" + corp.getAbsolutePath(), //
"jetty.port=8080");
// Create base
@@ -494,7 +494,7 @@ public class ExtraStartTest
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",//
- "--extra-start-dir=" + common.getAbsolutePath());
+ "--include-jetty-dir=" + common.getAbsolutePath());
MainResult result = runMain(base,home,
// command line property should override all others
@@ -530,21 +530,21 @@ public class ExtraStartTest
// standard property
"jetty.port=9090",
// INTENTIONAL BAD Reference (duplicate)
- "--extra-start-dir=" + common.getAbsolutePath());
+ "--include-jetty-dir=" + common.getAbsolutePath());
// Populate common
TestEnv.makeFile(common,"start.ini",
// standard property
"jetty.port=8080",
// reference to corp
- "--extra-start-dir=" + corp.getAbsolutePath());
+ "--include-jetty-dir=" + corp.getAbsolutePath());
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",//
- "--extra-start-dir=" + common.getAbsolutePath());
+ "--include-jetty-dir=" + common.getAbsolutePath());
try
{
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java b/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java
index 5e0e3c83c3..78859ee67b 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java
@@ -62,9 +62,9 @@ public class TestUseCases
}
@Test
- public void testWithExtraStartDir_Logging() throws Exception
+ public void testWithIncludeJettyDir_Logging() throws Exception
{
- assertUseCase("home","base.with.extra.start.dirs","assert-extra-start-dir-logging.txt");
+ assertUseCase("home","base.with.include.jetty.dirs","assert-include-jetty-dir-logging.txt");
}
@Test
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/config/ConfigSourcesTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/config/ConfigSourcesTest.java
index bc55cb746c..78611dd1f5 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/config/ConfigSourcesTest.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/config/ConfigSourcesTest.java
@@ -118,7 +118,7 @@ public class ConfigSourcesTest
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",//
- "--extra-start-dir=" + common.getAbsolutePath());
+ "--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources();
@@ -151,13 +151,13 @@ public class ConfigSourcesTest
ConfigSources sources = new ConfigSources();
- // Simple command line reference to extra-start-dir via property (also on command line)
+ // Simple command line reference to include-jetty-dir via property (also on command line)
String[] cmdLine = new String[] {
// property
"my.common=" + common.getAbsolutePath(),
// reference via property
- "--extra-start-dir=${my.common}" };
+ "--include-jetty-dir=${my.common}" };
sources.add(new CommandLineConfigSource(cmdLine));
sources.add(new JettyHomeConfigSource(home.toPath()));
@@ -198,12 +198,12 @@ public class ConfigSourcesTest
ConfigSources sources = new ConfigSources();
- // Simple command line reference to extra-start-dir via property (also on command line)
+ // Simple command line reference to include-jetty-dir via property (also on command line)
String[] cmdLine = new String[] {
// property to 'opt' dir
"my.opt=" + opt.getAbsolutePath(),
// reference via property prefix
- "--extra-start-dir=" + dirRef };
+ "--include-jetty-dir=" + dirRef };
sources.add(new CommandLineConfigSource(cmdLine));
sources.add(new JettyHomeConfigSource(home.toPath()));
@@ -244,7 +244,7 @@ public class ConfigSourcesTest
ConfigSources sources = new ConfigSources();
- // Simple command line reference to extra-start-dir via property (also on command line)
+ // Simple command line reference to include-jetty-dir via property (also on command line)
String[] cmdLine = new String[] {
// property to 'opt' dir
@@ -252,7 +252,7 @@ public class ConfigSourcesTest
// property to commmon dir name
"my.dir=common",
// reference via property prefix
- "--extra-start-dir=" + dirRef };
+ "--include-jetty-dir=" + dirRef };
sources.add(new CommandLineConfigSource(cmdLine));
sources.add(new JettyHomeConfigSource(home.toPath()));
@@ -284,7 +284,7 @@ public class ConfigSourcesTest
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",//
- "--extra-start-dir=" + common.getAbsolutePath());
+ "--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources();
@@ -323,8 +323,8 @@ public class ConfigSourcesTest
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",//
- "--extra-start-dir=" + common.getAbsolutePath(), //
- "--extra-start-dir=" + corp.getAbsolutePath());
+ "--include-jetty-dir=" + common.getAbsolutePath(), //
+ "--include-jetty-dir=" + corp.getAbsolutePath());
ConfigSources sources = new ConfigSources();
@@ -362,7 +362,7 @@ public class ConfigSourcesTest
File common = testdir.getFile("common");
FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", //
- "--extra-start-dir=" + corp.getAbsolutePath(), //
+ "--include-jetty-dir=" + corp.getAbsolutePath(), //
"jetty.port=8080");
// Create base
@@ -370,7 +370,7 @@ public class ConfigSourcesTest
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",//
- "--extra-start-dir=" + common.getAbsolutePath());
+ "--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources();
@@ -409,7 +409,7 @@ public class ConfigSourcesTest
FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", //
"my.corp=" + corp.getAbsolutePath(), //
- "--extra-start-dir=${my.corp}", //
+ "--include-jetty-dir=${my.corp}", //
"jetty.port=8080");
// Create base
@@ -418,7 +418,7 @@ public class ConfigSourcesTest
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",//
"my.common="+common.getAbsolutePath(), //
- "--extra-start-dir=${my.common}");
+ "--include-jetty-dir=${my.common}");
ConfigSources sources = new ConfigSources();
@@ -464,7 +464,7 @@ public class ConfigSourcesTest
File common = testdir.getFile("common");
FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", //
- "--extra-start-dir=" + corp.getAbsolutePath(), //
+ "--include-jetty-dir=" + corp.getAbsolutePath(), //
"jetty.port=8080");
// Create base
@@ -472,13 +472,13 @@ public class ConfigSourcesTest
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",//
- "--extra-start-dir=" + common.getAbsolutePath());
+ "--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources();
String cmdLine[] = new String[]{
- // command line provided extra-start-dir ref
- "--extra-start-dir=" + devops.getAbsolutePath()};
+ // command line provided include-jetty-dir ref
+ "--include-jetty-dir=" + devops.getAbsolutePath()};
sources.add(new CommandLineConfigSource(cmdLine));
sources.add(new JettyHomeConfigSource(home.toPath()));
sources.add(new JettyBaseConfigSource(base.toPath()));
@@ -514,7 +514,7 @@ public class ConfigSourcesTest
File common = testdir.getFile("common");
FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", //
- "--extra-start-dir=" + corp.getAbsolutePath(), //
+ "--include-jetty-dir=" + corp.getAbsolutePath(), //
"jetty.port=8080");
// Create base
@@ -522,7 +522,7 @@ public class ConfigSourcesTest
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",//
- "--extra-start-dir=" + common.getAbsolutePath());
+ "--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources();
@@ -564,21 +564,21 @@ public class ConfigSourcesTest
// standard property
"jetty.port=9090",
// INTENTIONAL BAD Reference (duplicate)
- "--extra-start-dir=" + common.getAbsolutePath());
+ "--include-jetty-dir=" + common.getAbsolutePath());
// Populate common
TestEnv.makeFile(common,"start.ini",
// standard property
"jetty.port=8080",
// reference to corp
- "--extra-start-dir=" + corp.getAbsolutePath());
+ "--include-jetty-dir=" + corp.getAbsolutePath());
// Create base
File base = testdir.getFile("base");
FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",//
- "--extra-start-dir=" + common.getAbsolutePath());
+ "--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources();
diff --git a/jetty-start/src/test/resources/extra-start-dirs/logging/etc/jetty-logging.xml b/jetty-start/src/test/resources/extra-jetty-dirs/logging/etc/jetty-logging.xml
index e69de29bb2..e69de29bb2 100644
--- a/jetty-start/src/test/resources/extra-start-dirs/logging/etc/jetty-logging.xml
+++ b/jetty-start/src/test/resources/extra-jetty-dirs/logging/etc/jetty-logging.xml
diff --git a/jetty-start/src/test/resources/extra-start-dirs/logging/lib/logging/logback.jar b/jetty-start/src/test/resources/extra-jetty-dirs/logging/lib/logging/logback.jar
index e69de29bb2..e69de29bb2 100644
--- a/jetty-start/src/test/resources/extra-start-dirs/logging/lib/logging/logback.jar
+++ b/jetty-start/src/test/resources/extra-jetty-dirs/logging/lib/logging/logback.jar
diff --git a/jetty-start/src/test/resources/extra-start-dirs/logging/start.ini b/jetty-start/src/test/resources/extra-jetty-dirs/logging/start.ini
index 905d6db4bb..905d6db4bb 100644
--- a/jetty-start/src/test/resources/extra-start-dirs/logging/start.ini
+++ b/jetty-start/src/test/resources/extra-jetty-dirs/logging/start.ini
diff --git a/jetty-start/src/test/resources/extra-start-dirs/more-startd/start.d/more.ini b/jetty-start/src/test/resources/extra-jetty-dirs/more-startd/start.d/more.ini
index e69de29bb2..e69de29bb2 100644
--- a/jetty-start/src/test/resources/extra-start-dirs/more-startd/start.d/more.ini
+++ b/jetty-start/src/test/resources/extra-jetty-dirs/more-startd/start.d/more.ini
diff --git a/jetty-start/src/test/resources/usecases/assert-extra-start-dir-logging.txt b/jetty-start/src/test/resources/usecases/assert-include-jetty-dir-logging.txt
index def27d7da7..def27d7da7 100644
--- a/jetty-start/src/test/resources/usecases/assert-extra-start-dir-logging.txt
+++ b/jetty-start/src/test/resources/usecases/assert-include-jetty-dir-logging.txt
diff --git a/jetty-start/src/test/resources/usecases/base.with.extra.start.dirs/start.ini b/jetty-start/src/test/resources/usecases/base.with.extra.start.dirs/start.ini
deleted file mode 100644
index 81e6d724e6..0000000000
--- a/jetty-start/src/test/resources/usecases/base.with.extra.start.dirs/start.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-
---extra-start-dir=${start.basedir}/../../extra-start-dirs/logging
---module=server,http,jmx
-
-jetty.port=9090
diff --git a/jetty-start/src/test/resources/usecases/base.with.include.jetty.dirs/start.ini b/jetty-start/src/test/resources/usecases/base.with.include.jetty.dirs/start.ini
new file mode 100644
index 0000000000..9e16be66fd
--- /dev/null
+++ b/jetty-start/src/test/resources/usecases/base.with.include.jetty.dirs/start.ini
@@ -0,0 +1,5 @@
+
+--include-jetty-dir=${start.basedir}/../../extra-jetty-dirs/logging
+--module=server,http,jmx
+
+jetty.port=9090

Back to the top