diff options
| author | Greg Wilkins | 2013-09-09 05:41:17 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2013-09-09 05:41:17 +0000 |
| commit | 070ce9dd22eb84f42c213a6f97ca95df2ac332ed (patch) | |
| tree | 20e04f7ba5c4f142bca3c333604fda2bd52497f2 /jetty-webapp/src/main/java | |
| parent | 7df5cf762c50580901518ec6490eda5169fbd0e1 (diff) | |
| parent | 767faece5c4692748d1ac8e130b2e4c5faa1ff20 (diff) | |
| download | org.eclipse.jetty.project-070ce9dd22eb84f42c213a6f97ca95df2ac332ed.tar.gz org.eclipse.jetty.project-070ce9dd22eb84f42c213a6f97ca95df2ac332ed.tar.xz org.eclipse.jetty.project-070ce9dd22eb84f42c213a6f97ca95df2ac332ed.zip | |
Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
Diffstat (limited to 'jetty-webapp/src/main/java')
| -rw-r--r-- | jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java index f6ddd1fc36..2fe990edb6 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java @@ -94,8 +94,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL private String[] __dftProtectedTargets = {"/web-inf", "/meta-inf"}; - - public static String[] DEFAULT_CONFIGURATION_CLASSES = + public static final String[] DEFAULT_CONFIGURATION_CLASSES = { "org.eclipse.jetty.webapp.WebInfConfiguration", "org.eclipse.jetty.webapp.WebXmlConfiguration", |