Revision: 10347
Author:   [email protected]
Date:     Fri Jun 17 06:12:25 2011
Log: New projects should always have a DTD specified in their template .gwt.xml module file
Also, fix broken NoNag version check logic.

Review at http://gwt-code-reviews.appspot.com/1407803

Review by: [email protected]
http://code.google.com/p/google-web-toolkit/source/detail?r=10347

Modified:
 /trunk/user/src/com/google/gwt/user/tools/WebAppCreator.java

=======================================
--- /trunk/user/src/com/google/gwt/user/tools/WebAppCreator.java Thu Mar 31 03:22:04 2011 +++ /trunk/user/src/com/google/gwt/user/tools/WebAppCreator.java Fri Jun 17 06:12:25 2011
@@ -458,13 +458,22 @@
String gwtValidationPath = installPath + '/' + "validation-api-1.0.0.GA.jar"; String gwtValidationSourcesPath = installPath + '/' + "validation-api-1.0.0.GA-sources.jar";

-    // Public builds generate a DTD reference.
-    String gwtModuleDtd = "";
+    // Generate a DTD reference.
+ String gwtModuleDtd = "\n<!-- Using DTD from SVN 'trunk'. You probably want to change this"
+        + " to a specific, release tagged, DTD -->"
+ + "\n<!DOCTYPE module PUBLIC \"-//Google Inc.//DTD Google Web Toolkit "
+        + About.getGwtVersionNum()
+        + "//EN\" \"http://google-web-toolkit.googlecode.com/svn/trunk/";
+        + "/distro-source/core/src/gwt-module.dtd\">";
     GwtVersion gwtVersion = About.getGwtVersionObject();
-    if (gwtVersion.isNoNagVersion()) {
- gwtModuleDtd = "\n<!DOCTYPE module PUBLIC \"-//Google Inc.//DTD Google Web Toolkit "
-          + About.getGwtVersionNum()
-          + "//EN\" \"http://google-web-toolkit.googlecode.com/svn/tags/";
+ if (!gwtVersion.isNoNagVersion() && !gwtVersion.equals(new GwtVersion(null))) {
+      gwtModuleDtd = "\n<!--"
+ + "\n When updating your version of GWT, you should also update this DTD reference," + + "\n so that your app can take advantage of the latest GWT module capabilities."
+          + "\n-->"
+ + "\n<!DOCTYPE module PUBLIC \"-//Google Inc.//DTD Google Web Toolkit "
+          + About.getGwtVersionNum() + "//EN\""
+          + "\n  \"http://google-web-toolkit.googlecode.com/svn/tags/";
           + About.getGwtVersionNum()
           + "/distro-source/core/src/gwt-module.dtd\">";
     }

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

Reply via email to