Enable Super Dev Mode for samples that use Ant
Also enables Super Dev Mode by default in Ant
projects created using webAppCreator.
Change-Id: Ia515696a420adbead2d9776330d430b4ab428c04
diff --git a/samples/dynatable/src/com/google/gwt/sample/dynatable/DynaTable.gwt.xml b/samples/dynatable/src/com/google/gwt/sample/dynatable/DynaTable.gwt.xml
index 8ee2188..acedf6d 100644
--- a/samples/dynatable/src/com/google/gwt/sample/dynatable/DynaTable.gwt.xml
+++ b/samples/dynatable/src/com/google/gwt/sample/dynatable/DynaTable.gwt.xml
@@ -17,4 +17,8 @@
<entry-point class='com.google.gwt.sample.dynatable.client.DynaTable' />
<servlet path='/calendar'
class='com.google.gwt.sample.dynatable.server.SchoolCalendarServiceImpl' />
+
+ <!-- allow Super Dev Mode -->
+ <add-linker name="xsiframe"/>
+ <set-configuration-property name="devModeRedirectEnabled" value="true"/>
</module>
diff --git a/samples/hello/src/com/google/gwt/sample/hello/Hello.gwt.xml b/samples/hello/src/com/google/gwt/sample/hello/Hello.gwt.xml
index 26666f2..bbae1eb 100644
--- a/samples/hello/src/com/google/gwt/sample/hello/Hello.gwt.xml
+++ b/samples/hello/src/com/google/gwt/sample/hello/Hello.gwt.xml
@@ -13,10 +13,10 @@
<!-- limitations under the License. -->
<module rename-to="hello">
- <inherits name="com.google.gwt.user.User"/>
- <entry-point class="com.google.gwt.sample.hello.client.Hello"/>
+ <inherits name="com.google.gwt.user.User"/>
+ <entry-point class="com.google.gwt.sample.hello.client.Hello"/>
- <!-- Changing the linker is only necessary if you want to try out SuperDevMode -->
- <add-linker name="xsiframe"/>
- <set-configuration-property name="devModeRedirectEnabled" value="true"/>
+ <!-- allow Super Dev Mode -->
+ <add-linker name="xsiframe"/>
+ <set-configuration-property name="devModeRedirectEnabled" value="true"/>
</module>
diff --git a/samples/json/src/com/google/gwt/sample/json/JSON.gwt.xml b/samples/json/src/com/google/gwt/sample/json/JSON.gwt.xml
index a8c264b..7e1c5e5 100644
--- a/samples/json/src/com/google/gwt/sample/json/JSON.gwt.xml
+++ b/samples/json/src/com/google/gwt/sample/json/JSON.gwt.xml
@@ -13,8 +13,13 @@
<!-- limitations under the License. -->
<module rename-to="json">
- <inherits name='com.google.gwt.user.User'/>
- <inherits name='com.google.gwt.http.HTTP'/>
- <inherits name='com.google.gwt.json.JSON'/>
- <entry-point class='com.google.gwt.sample.json.client.JSON'/>
+ <inherits name='com.google.gwt.user.User'/>
+ <inherits name='com.google.gwt.http.HTTP'/>
+ <inherits name='com.google.gwt.json.JSON'/>
+ <entry-point class='com.google.gwt.sample.json.client.JSON'/>
+
+
+ <!-- allow Super Dev Mode -->
+ <add-linker name="xsiframe"/>
+ <set-configuration-property name="devModeRedirectEnabled" value="true"/>
</module>
diff --git a/samples/logexample/src/com/google/gwt/sample/logexample/LogExample.gwt.xml b/samples/logexample/src/com/google/gwt/sample/logexample/LogExample.gwt.xml
index b01e472..55dbd1a 100644
--- a/samples/logexample/src/com/google/gwt/sample/logexample/LogExample.gwt.xml
+++ b/samples/logexample/src/com/google/gwt/sample/logexample/LogExample.gwt.xml
@@ -35,5 +35,8 @@
<set-property name="gwt.logging.popupHandler" value="DISABLED" />
<set-property name="gwt.logging.systemHandler" value="DISABLED" />
-->
-
+
+ <!-- allow Super Dev Mode -->
+ <add-linker name="xsiframe"/>
+ <set-configuration-property name="devModeRedirectEnabled" value="true"/>
</module>
diff --git a/samples/mail/src/com/google/gwt/sample/mail/Mail.gwt.xml b/samples/mail/src/com/google/gwt/sample/mail/Mail.gwt.xml
index c2fd3c0..1a13d26 100644
--- a/samples/mail/src/com/google/gwt/sample/mail/Mail.gwt.xml
+++ b/samples/mail/src/com/google/gwt/sample/mail/Mail.gwt.xml
@@ -20,4 +20,8 @@
<set-configuration-property name="CssResource.obfuscationPrefix" value="M" />
<entry-point class='com.google.gwt.sample.mail.client.Mail' />
+
+ <!-- allow Super Dev Mode -->
+ <add-linker name="xsiframe"/>
+ <set-configuration-property name="devModeRedirectEnabled" value="true"/>
</module>
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/Showcase.gwt.xml b/samples/showcase/src/com/google/gwt/sample/showcase/Showcase.gwt.xml
index f6677a6..44720d5 100644
--- a/samples/showcase/src/com/google/gwt/sample/showcase/Showcase.gwt.xml
+++ b/samples/showcase/src/com/google/gwt/sample/showcase/Showcase.gwt.xml
@@ -28,4 +28,8 @@
<set-property-fallback name="locale" value="en"/>
<set-configuration-property name="locale.cookie" value="SHOWCASE_LOCALE"/>
<set-configuration-property name="locale.useragent" value="Y"/>
+
+ <!-- allow Super Dev Mode -->
+ <add-linker name="xsiframe"/>
+ <set-configuration-property name="devModeRedirectEnabled" value="true"/>
</module>
diff --git a/samples/showcase/src/com/google/gwt/sample/showcase/client/ContentWidget.java b/samples/showcase/src/com/google/gwt/sample/showcase/client/ContentWidget.java
index d224c0b..26ebddd 100644
--- a/samples/showcase/src/com/google/gwt/sample/showcase/client/ContentWidget.java
+++ b/samples/showcase/src/com/google/gwt/sample/showcase/client/ContentWidget.java
@@ -377,10 +377,12 @@
* Send a request for source code.
*
* @param callback the {@link RequestCallback} to send
- * @param url the URL to target
+ * @param urlSuffix the URL to target, relative to the Showcase module's base URL.
*/
- private void sendSourceRequest(RequestCallback callback, String url) {
- RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, GWT.getModuleBaseURL() + url);
+ private void sendSourceRequest(RequestCallback callback, String urlSuffix) {
+ // When Super Dev Mode is on, we will load it from the code server, not the original server.
+ String url = GWT.getModuleBaseForStaticFiles() + urlSuffix;
+ RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, url);
builder.setCallback(callback);
try {
builder.send();
diff --git a/samples/validation/src/main/java/com/google/gwt/sample/validation/Validation.gwt.xml b/samples/validation/src/main/java/com/google/gwt/sample/validation/Validation.gwt.xml
index 04a1068..02454ec 100644
--- a/samples/validation/src/main/java/com/google/gwt/sample/validation/Validation.gwt.xml
+++ b/samples/validation/src/main/java/com/google/gwt/sample/validation/Validation.gwt.xml
@@ -40,4 +40,8 @@
<when-type-is
class="com.google.gwt.validation.client.UserValidationMessagesResolver" />
</replace-with>
+
+ <!-- allow Super Dev Mode -->
+ <add-linker name="xsiframe"/>
+ <set-configuration-property name="devModeRedirectEnabled" value="true"/>
</module>
diff --git a/user/src/com/google/gwt/user/tools/templates/ant/build.xmlsrc b/user/src/com/google/gwt/user/tools/templates/ant/build.xmlsrc
index f24587d..bf15106 100644
--- a/user/src/com/google/gwt/user/tools/templates/ant/build.xmlsrc
+++ b/user/src/com/google/gwt/user/tools/templates/ant/build.xmlsrc
@@ -74,14 +74,13 @@
<target name="superdevmode" depends="javac" description="Run Super Dev Mode">
<java failonerror="true" fork="true" classname="com.google.gwt.dev.codeserver.CodeServer">
<classpath>
+ <pathelement location="@srcFolder"/>
<pathelement location="@gwtCodeServerPath" />
<path refid="project.class.path"/>
<pathelement location="@gwtValidationPath" />
<pathelement location="@gwtValidationSourcesPath" />
</classpath>
<jvmarg value="-Xmx256M"/>
- <arg value="-src"/>
- <arg value="@srcFolder"/>
<arg value="@moduleName"/>
</java>
</target>@antEclipseRule
diff --git a/user/src/com/google/gwt/user/tools/templates/sample/_srcFolder_/_moduleFolder_/_moduleShortName_.gwt.xmlsrc b/user/src/com/google/gwt/user/tools/templates/sample/_srcFolder_/_moduleFolder_/_moduleShortName_.gwt.xmlsrc
index 858c3dc..e836953 100644
--- a/user/src/com/google/gwt/user/tools/templates/sample/_srcFolder_/_moduleFolder_/_moduleShortName_.gwt.xmlsrc
+++ b/user/src/com/google/gwt/user/tools/templates/sample/_srcFolder_/_moduleFolder_/_moduleShortName_.gwt.xmlsrc
@@ -20,4 +20,7 @@
<source path='client'/>
<source path='shared'/>
+ <!-- allow Super Dev Mode -->
+ <add-linker name="xsiframe"/>
+ <set-configuration-property name="devModeRedirectEnabled" value="true"/>
</module>
