Merge remote-tracking branch 'origin/master' into servlet-3.1-api

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java

3 files changed, 3 insertions, 13 deletions

diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index cd6ff52255..77b3227207 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -8,6 +8,7 @@
   <artifactId>jetty-webapp</artifactId>
   <name>Jetty :: Webapp Application Support</name>
   <description>Jetty web application support</description>
+  <url>http://www.eclipse.org/jetty</url>
   <properties>
     <bundle-symbolic-name>${project.groupId}.webapp</bundle-symbolic-name>
   </properties>
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 650c6a0873..4f37eae0d7 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
@@ -1083,6 +1083,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
         
     }
 
+
     /* ------------------------------------------------------------ */
     /**
      * @param extractWAR True if war files are extracted
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebXmlConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebXmlConfiguration.java
index aad8c963cd..776eecb132 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebXmlConfiguration.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebXmlConfiguration.java
@@ -120,25 +120,13 @@ public class WebXmlConfiguration extends AbstractConfiguration
     /* ------------------------------------------------------------------------------- */
     @Override
     public void deconfigure (WebAppContext context) throws Exception
-    {
-        // TODO preserve any configuration that pre-existed.
-
-        ServletHandler _servletHandler = context.getServletHandler();
-       
-        _servletHandler.setFilters(null);
-        _servletHandler.setFilterMappings(null);
-        _servletHandler.setServlets(null);
-        _servletHandler.setServletMappings(null);
-
-        context.setEventListeners(null);
+    {      
         context.setWelcomeFiles(null);
 
         if (context.getErrorHandler() instanceof ErrorPageErrorHandler)
             ((ErrorPageErrorHandler) 
                     context.getErrorHandler()).setErrorPages(null);
 
-
         // TODO remove classpaths from classloader
-
     }
 }