Disable XML validation in internal jetty. git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4775 8db76d5a-ed1c-0410-87a9-c151d255dfc7

diff --git a/dev/core/src/com/google/gwt/dev/ServletValidator.java b/dev/core/src/com/google/gwt/dev/ServletValidator.java
index 4ad496e..6f495bd 100644
--- a/dev/core/src/com/google/gwt/dev/ServletValidator.java
+++ b/dev/core/src/com/google/gwt/dev/ServletValidator.java

@@ -16,7 +16,6 @@
 package com.google.gwt.dev;
 
 import com.google.gwt.core.ext.TreeLogger;
-import com.google.gwt.dev.util.InstalledHelpInfo;
 
 import org.mortbay.jetty.servlet.ServletHandler;
 import org.mortbay.jetty.servlet.ServletHolder;
@@ -51,7 +50,10 @@
 
   public static ServletValidator create(TreeLogger logger, URL webXmlUrl) {
     String webXmlUrlString = webXmlUrl.toExternalForm();
+    String oldProp = System.getProperty("org.mortbay.xml.XmlParser.Validating",
+        "false");
     try {
+      System.setProperty("org.mortbay.xml.XmlParser.Validating", "false");
       WebXmlConfiguration wxc = new WebXmlConfiguration();
       ServletHandler myServletHandler = new ServletHandler();
       wxc.setWebAppContext(new WebAppContext(null, null, myServletHandler, null));
@@ -79,16 +81,11 @@
       logger.log(TreeLogger.WARN, "Unable to process '" + webXmlUrlString
           + "' for servlet validation", e);
       return null;
+    } finally {
+      System.setProperty("org.mortbay.xml.XmlParser.Validating", oldProp);
     }
   }
 
-  public static TreeLogger createServletValidatorBranch(TreeLogger logger,
-      String moduleName) {
-    return logger.branch(TreeLogger.DEBUG,
-        "Validating <servlet> tags for module '" + moduleName + "'", null,
-        new InstalledHelpInfo("servletMappings.html"));
-  }
-
   static String generateMissingMappingMessage(String servletClass,
       String servletPath, String servletName) {
     return "Module declares a servlet class '"

diff --git a/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java b/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
index 5fb8d92..651239c 100644
--- a/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
+++ b/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java

@@ -263,6 +263,9 @@
       }
     }
 
+    // Turn off XML validation.
+    System.setProperty("org.mortbay.xml.XmlParser.Validating", "false");
+
     SelectChannelConnector connector = new SelectChannelConnector();
     connector.setPort(port);