Allow source samples to forgo having a war folder
Removed war folders from expenses and mobilewebapp samples
Removed redundant task in samples's source target
Review at http://gwt-code-reviews.appspot.com/1451807
Review by: rjrjr@google.com
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10262 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/samples/common.ant.xml b/samples/common.ant.xml
index 6d4cc3a..a0b8784 100755
--- a/samples/common.ant.xml
+++ b/samples/common.ant.xml
@@ -38,10 +38,15 @@
<copy todir="${sample.build}/src">
<fileset dir="src" />
</copy>
- <mkdir dir="${sample.build}/war" />
- <copy todir="${sample.build}/war">
- <fileset dir="war" excludes="WEB-INF/classes/**"/>
- </copy>
+ <if>
+ <available file="war" type="dir" />
+ <then>
+ <mkdir dir="${sample.build}/war" />
+ <copy todir="${sample.build}/war">
+ <fileset dir="war" excludes="WEB-INF/classes/**"/>
+ </copy>
+ </then>
+ </if>
<if>
<available file="pom.xml"/>
<then>
@@ -67,12 +72,6 @@
</then>
</if>
<if>
- <available file="user-build.xml"/>
- <then>
- <copy tofile="${sample.build}/build.xml" file="user-build.xml"/>
- </then>
- </if>
- <if>
<available file="user-project"/>
<then>
<copy tofile="${sample.build}/.project" file="user-project"/>
diff --git a/samples/expenses/war/.place-holder b/samples/expenses/war/.place-holder
deleted file mode 100644
index e69de29..0000000
--- a/samples/expenses/war/.place-holder
+++ /dev/null
diff --git a/samples/mobilewebapp/war/.place-holder b/samples/mobilewebapp/war/.place-holder
deleted file mode 100644
index e69de29..0000000
--- a/samples/mobilewebapp/war/.place-holder
+++ /dev/null
