Revision: 7201 Author: [email protected] Date: Mon Nov 30 11:56:35 2009 Log: Don't validate servlet tags with -noserver.
Patch by: sami.jaber Review by: me, jat http://code.google.com/p/google-web-toolkit/source/detail?r=7201 Modified: /trunk/dev/core/src/com/google/gwt/dev/DevMode.java ======================================= --- /trunk/dev/core/src/com/google/gwt/dev/DevMode.java Mon Nov 23 21:20:12 2009 +++ /trunk/dev/core/src/com/google/gwt/dev/DevMode.java Mon Nov 30 11:56:35 2009 @@ -329,7 +329,7 @@ ServletValidator servletValidator = null; File webXml = new File(options.getWarDir(), "WEB-INF/web.xml"); - if (webXml.exists()) { + if (!options.isNoServer() && webXml.exists()) { servletValidator = ServletValidator.create(getTopLogger(), webXml); } @@ -343,7 +343,9 @@ // actually load the module from the browser. startupModules.put(module.getName(), module); Util.recursiveDelete(options.getShellBaseWorkDir(module), false); - validateServletTags(moduleBranch, servletValidator, module, webXml); + if (!options.isNoServer()) { + validateServletTags(moduleBranch, servletValidator, module, webXml); + } TreeLogger loadLogger = moduleBranch.branch(TreeLogger.DEBUG, "Bootstrap link for command-line module '" + moduleName + "'"); link(loadLogger, module); @@ -406,10 +408,10 @@ // Look for launchable files directly under war File warDir = options.getWarDir(); for (File htmlFile : warDir.listFiles(new FilenameFilter() { - public boolean accept(File dir, String name) { - return STARTUP_FILE_PATTERN.matcher(name).matches(); - } - })) { + public boolean accept(File dir, String name) { + return STARTUP_FILE_PATTERN.matcher(name).matches(); + } + })) { options.addStartupURL(htmlFile.getName()); } } -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
