Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2014-04-15 20:40:16 +0000
committerJoakim Erdfelt2014-04-15 20:40:16 +0000
commite5314d4a3e0df85a786bcddb3927a0793f32f52e (patch)
treee1a5d1041d77e404bce0412732941dc8fb7fe250 /jetty-start
parentdc3362ba3c1dded62f8434d1418f0c6bbcc8ef17 (diff)
downloadorg.eclipse.jetty.project-e5314d4a3e0df85a786bcddb3927a0793f32f52e.tar.gz
org.eclipse.jetty.project-e5314d4a3e0df85a786bcddb3927a0793f32f52e.tar.xz
org.eclipse.jetty.project-e5314d4a3e0df85a786bcddb3927a0793f32f52e.zip
432321 - jetty-start / Allow defining extra start directories for common configurations
+ Adding Config Search order output to --list-config
Diffstat (limited to 'jetty-start')
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/Main.java2
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java27
2 files changed, 25 insertions, 4 deletions
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 97734a91ff..9e46100f91 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
@@ -307,7 +307,7 @@ public class Main
public void listConfig(StartArgs args)
{
// Dump Jetty Home / Base
- args.dumpEnvironment();
+ args.dumpEnvironment(baseHome);
// Dump JVM Args
args.dumpJvmArgs();
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 34b5aa3458..cde9f562f3 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
@@ -37,6 +37,7 @@ import java.util.StringTokenizer;
import org.eclipse.jetty.start.Props.Prop;
import org.eclipse.jetty.start.config.ConfigSource;
import org.eclipse.jetty.start.config.ConfigSources;
+import org.eclipse.jetty.start.config.DirConfigSource;
/**
* The Arguments required to start Jetty.
@@ -166,7 +167,7 @@ public class StartArgs
}
}
- public void dumpEnvironment()
+ public void dumpEnvironment(BaseHome baseHome)
{
// Java Details
System.out.println();
@@ -188,10 +189,30 @@ public class StartArgs
System.out.println();
System.out.println("Jetty Environment:");
System.out.println("-----------------");
-
+ dumpProperty("jetty.version");
dumpProperty("jetty.home");
dumpProperty("jetty.base");
- dumpProperty("jetty.version");
+
+ // Jetty Configuration Environment
+ System.out.println();
+ System.out.println("Config Search Order:");
+ System.out.println("--------------------");
+ for (ConfigSource config : baseHome.getConfigSources())
+ {
+ System.out.printf(" %s",config.getId());
+ if (config instanceof DirConfigSource)
+ {
+ DirConfigSource dirsource = (DirConfigSource)config;
+ if (dirsource.isPropertyBased())
+ {
+ System.out.printf(" -> %s",dirsource.getDir());
+ }
+ }
+ System.out.println();
+ }
+
+ // Jetty Se
+ System.out.println();
}
public void dumpJvmArgs()

Back to the top