[gwt-contrib] [google-web-toolkit commit] r4775 - in releases/1.6/dev/core/src/com/google/gwt/dev: . shell/jetty

[codesite-noreply]

Author: sco...@google.com
Date: Tue Feb 17 17:26:50 2009
New Revision: 4775

Modified:
    releases/1.6/dev/core/src/com/google/gwt/dev/ServletValidator.java
     
releases/1.6/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java

Log:
Disable XML validation in internal jetty.

Modified: releases/1.6/dev/core/src/com/google/gwt/dev/ServletValidator.java
==============================================================================
--- releases/1.6/dev/core/src/com/google/gwt/dev/ServletValidator.java   
(original)
+++ releases/1.6/dev/core/src/com/google/gwt/dev/ServletValidator.java  Tue  
Feb 17 17:26:50 2009
@@ -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,14 +81,9 @@
        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,

Modified:  
releases/1.6/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
==============================================================================
---  
releases/1.6/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java     
 
(original)
+++  
releases/1.6/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java     
 
Tue Feb 17 17:26:50 2009
@@ -263,6 +263,9 @@
        }
      }

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



--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---