Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

418441 - Use of OPTIONS= in Jetty 9.1 should display WARNING message

This commit is contained in:
Joakim Erdfelt 2013-10-03 11:53:37 -07:00
parent 4a27f3bf4e
commit 1620b34a6e
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
View File

@ -79,7 +79,7 @@ public class StartArgs
private List<String> jvmArgs = new ArrayList<>();
private List<String> moduleStartdIni = new ArrayList<>();
private List<String> moduleStartIni = new ArrayList<>();
private Map<String,String> propertySource = new HashMap<>();
private Map<String, String> propertySource = new HashMap<>();
private String moduleGraphFilename;
private Modules allModules;
@ -207,7 +207,7 @@ public class StartArgs
System.out.println(" (no properties specified)");
return;
}
List<String> sortedKeys = new ArrayList<>();
@SuppressWarnings("unchecked")
Enumeration<String> keyEnum = (Enumeration<String>)properties.propertyNames();
@ -215,10 +215,10 @@ public class StartArgs
{
sortedKeys.add(keyEnum.nextElement());
}
Collections.sort(sortedKeys);
for(String key: sortedKeys)
for (String key : sortedKeys)
{
String value = properties.getProperty(key);
System.out.printf(" %s = %s%n",key,value);
@ -236,7 +236,7 @@ public class StartArgs
System.out.println(" (no system properties specified)");
return;
}
List<String> sortedKeys = new ArrayList<>();
sortedKeys.addAll(systemPropertyKeys);
Collections.sort(sortedKeys);
@ -680,10 +680,10 @@ public class StartArgs
exec = true;
return;
}
// Arbitrary Libraries
if(arg.startsWith("--lib="))
if (arg.startsWith("--lib="))
{
String cp = getValue(arg);
classpath.addClasspath(cp);
@ -779,13 +779,27 @@ public class StartArgs
{
String key = arg.substring(0,idx);
String value = arg.substring(idx + 1);
if (source!=CMD_LINE_SOURCE)
if (source != CMD_LINE_SOURCE)
{
if (propertySource.containsKey(key))
{
throw new UsageException(ERR_BAD_ARG,"Property %s in %s already set in %s",key,source,propertySource.get(key));
}
propertySource.put(key,source);
}
if ("OPTION".equals(key) || "OPTIONS".equals(key))
{
StringBuilder warn = new StringBuilder();
warn.append("The behavior of the argument ");
warn.append(arg).append(" (seen in ").append(source);
warn.append(") has changed, and is now considered a normal property. ");
warn.append(key).append(" no longer controls what libraries are on your classpath,");
warn.append(" use --module instead. See --help for details.");
StartLog.warn(warn.toString());
}
properties.setProperty(key,value);
return;
}

4
jetty-start/src/main/java/org/eclipse/jetty/start/StartLog.java
View File

@ -60,12 +60,12 @@ public class StartLog
public static void info(String format, Object... args)
{
System.err.printf(format + "%n",args);
System.err.printf("WARNING: " + format + "%n",args);
}
public static void warn(String format, Object... args)
{
System.err.printf(format + "%n",args);
System.err.printf("WARNING: " + format + "%n",args);
}
public static void warn(Throwable t)