415839 - jetty-start / warning about need for --exec given when not needed by default configuration

+ Adding exclusion on System properties check for jetty.home and jetty.base
This commit is contained in:
Joakim Erdfelt 2013-08-26 14:44:48 -07:00
parent c61cbaec2b
commit b6dbdd98d4
2 changed files with 34 additions and 2 deletions

View File

@ -311,6 +311,9 @@ public class Main
// Dump JVM Args
args.dumpJvmArgs();
// Dump System Properties
args.dumpSystemProperties();
// Dump Properties
args.dumpProperties();

View File

@ -185,6 +185,25 @@ public class StartArgs
}
}
public void dumpSystemProperties()
{
System.out.println();
System.out.println("System Properties:");
System.out.println("------------------");
if (systemPropertyKeys.isEmpty())
{
System.out.println(" (no system properties specified)");
return;
}
for (String key : systemPropertyKeys)
{
String value = System.getProperty(key);
System.out.printf(" %s = %s%n",key,value);
}
}
public void dumpProperties()
{
System.out.println();
@ -373,7 +392,7 @@ public class StartArgs
ensureSystemPropertySet("STOP.PORT");
ensureSystemPropertySet("STOP.KEY");
ensureSystemPropertySet("STOP.WAIT");
// Check if we need to pass properties as a file
if (properties.size() > 0)
{
@ -473,7 +492,17 @@ public class StartArgs
public boolean hasSystemProperties()
{
return systemPropertyKeys.size() > 0;
for (String key : systemPropertyKeys)
{
// ignored keys
if ("jetty.home".equals(key) || "jetty.base".equals(key))
{
// skip
continue;
}
return true;
}
return false;
}
public boolean isDryRun()