Integrate r11136 into releases/2.5.
Review by: rchandia@google.com
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.5@11144 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/distro-source/core/src/samples/build.xml b/distro-source/core/src/samples/build.xml
index b8b4386..d7105b1 100644
--- a/distro-source/core/src/samples/build.xml
+++ b/distro-source/core/src/samples/build.xml
@@ -2,12 +2,13 @@
<target name="-do">
<ant target="${target}" dir="DynaTable"/>
- <ant target="${target}" dir="DynaTableRf"/>
<ant target="${target}" dir="Hello"/>
<ant target="${target}" dir="JSON"/>
<ant target="${target}" dir="LogExample"/>
<ant target="${target}" dir="Mail"/>
<ant target="${target}" dir="Showcase"/>
+ <ant target="${target}" dir="SimpleRPC"/>
+ <ant target="${target}" dir="SimpleXML"/>
</target>
<target name="build" description="Build all samples">
diff --git a/samples/build.xml b/samples/build.xml
index 0fe5f5f..c59549a 100644
--- a/samples/build.xml
+++ b/samples/build.xml
@@ -42,6 +42,14 @@
<gwt.ant dir="showcase" />
</target>
+ <target name="simplexml" description="Build xml sample">
+ <gwt.ant dir="simplexml" />
+ </target>
+
+ <target name="simplerpc" description="Build rpc sample">
+ <gwt.ant dir="simplerpc" />
+ </target>
+
<target name="validation" description="Build validation">
<gwt.ant dir="validation" target="source" />
</target>
@@ -60,6 +68,8 @@
<antcall target="mail" />
<antcall target="mobilewebapp" />
<antcall target="showcase" />
+ <antcall target="simplerpc" />
+ <antcall target="simplexml" />
<antcall target="validation" />
<!-- don't include validationtck, it is not really a sample -->
</target>
diff --git a/samples/dynatablerf/build.xml b/samples/dynatablerf/build.xml
index 61e7950..393ae51 100755
--- a/samples/dynatablerf/build.xml
+++ b/samples/dynatablerf/build.xml
@@ -1,7 +1,7 @@
-<project name="dynatablerf" default="build" basedir=".">
+<project name="dynatablerf" default="source" basedir=".">
<property name="sample.root" value="dynatablerf" />
<property name="sample.module" value="DynaTableRf" />
- <property name="sample.path" value="src" />
+ <property name="sample.path" value="src/main/java" />
<import file="../common.ant.xml" />
<!-- these are after the common.ant.xml so they have gwt.tools etc -->
<path id="sample.extraclasspath">
diff --git a/samples/expenses/build.xml b/samples/expenses/build.xml
index 63df9f2..8905900 100755
--- a/samples/expenses/build.xml
+++ b/samples/expenses/build.xml
@@ -1,4 +1,4 @@
-<project name="expenses" default="build" basedir=".">
+<project name="expenses" default="source" basedir=".">
<property name="sample.root" value="expenses" />
<property name="sample.module" value="Expenses" />
<property name="sample.path" value="src/main/java" />
diff --git a/samples/validation/build.xml b/samples/validation/build.xml
index e8ba32c..19b1d73 100755
--- a/samples/validation/build.xml
+++ b/samples/validation/build.xml
@@ -1,4 +1,4 @@
-<project name="validation" default="build" basedir=".">
+<project name="validation" default="source" basedir=".">
<property name="sample.root" value="validation" />
<property name="sample.module" value="Validation" />
<property name="sample.path" value="src" />
