diff options
| author | Greg Wilkins | 2014-03-17 07:22:36 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2014-03-18 22:56:19 +0000 |
| commit | 119718d86fb773ae9c5839639107de4be126999e (patch) | |
| tree | 1788a20ec32bd5e4e5f59143c7ac5b8af42496d2 /jetty-webapp/src/main/java | |
| parent | 1ffd308bbef7c9cad816631131c1029fe7ac88db (diff) | |
| download | org.eclipse.jetty.project-119718d86fb773ae9c5839639107de4be126999e.tar.gz org.eclipse.jetty.project-119718d86fb773ae9c5839639107de4be126999e.tar.xz org.eclipse.jetty.project-119718d86fb773ae9c5839639107de4be126999e.zip | |
added jetty-quickstart module
Diffstat (limited to 'jetty-webapp/src/main/java')
| -rw-r--r-- | jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaData.java | 5 | ||||
| -rw-r--r-- | jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java | 17 |
2 files changed, 18 insertions, 4 deletions
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaData.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaData.java index 2d32f033e2..3fde5536e1 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaData.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/MetaData.java @@ -334,6 +334,11 @@ public class MetaData { _descriptorProcessors.add(p); } + + public void removeDescriptorProcessor(DescriptorProcessor p) + { + _descriptorProcessors.remove(p); + } public void orderFragments () 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 d0d65f2856..aceff2017e 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 @@ -115,6 +115,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL "org.eclipse.jetty.jndi.", // webapp cannot change naming classes "org.eclipse.jetty.jaas.", // webapp cannot change jaas classes "org.eclipse.jetty.websocket.", // webapp cannot change / replace websocket classes + "org.eclipse.jetty.util.log.", // webapp should use server log "org.eclipse.jetty.servlet.DefaultServlet", // webapp cannot change default servlets "org.eclipse.jetty.servlets.AsyncGzipFilter" // special case for AsyncGzipFilter } ; @@ -132,7 +133,8 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL "-org.eclipse.jetty.servlet.DefaultServlet", // don't hide default servlet "-org.eclipse.jetty.servlet.listener.", // don't hide useful listeners "-org.eclipse.jetty.websocket.", // don't hide websocket classes from webapps (allow webapp to use ones from system classloader) - "-org.eclipse.jetty.apache.", // don't jetty apache impls + "-org.eclipse.jetty.apache.", // don't hide jetty apache impls + "-org.eclipse.jetty.util.log.", // don't hide server log "org.eclipse.jetty." // hide other jetty classes } ; @@ -943,7 +945,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL */ public void setConfigurationClasses(String[] configurations) { - if (isRunning()) + if (isStarted()) throw new IllegalStateException(); _configurationClasses.clear(); if (configurations!=null) @@ -962,7 +964,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL */ public void setConfigurations(Configuration[] configurations) { - if (isRunning()) + if (isStarted()) throw new IllegalStateException(); _configurations.clear(); if (configurations!=null) @@ -1345,9 +1347,16 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL //resolve the metadata _metadata.resolve(this); + startWebapp(); + } + + /* ------------------------------------------------------------ */ + protected void startWebapp() + throws Exception + { super.startContext(); } - + /* ------------------------------------------------------------ */ @Override public Set<String> setServletSecurity(Dynamic registration, ServletSecurityElement servletSecurityElement) |