summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-09-17 19:00:57 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-09-17 19:00:57 +0000
commitde6fbf1093d244b43ed5615d4db26dcdc922f3e7 (patch)
tree83196c00ad7a7928d292fa3a61a91ddeb468d964
parent0fe59ecf2333f729757abc35557dc72ab469cb71 (diff)
Fix code for "clean" target in generated build.xml files (TUSCANY-3680)
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@998257 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java4
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-webapp/build.xml4
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/build.xml4
3 files changed, 3 insertions, 9 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java b/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
index b44dd16a91..54ac6c7481 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
@@ -281,9 +281,7 @@ public class AntGeneratorMojo extends AbstractMojo {
// Generate the clean target
pw.println(" <target name=\"clean\">");
- pw.println(" <delete includeemptydirs=\"true\">");
- pw.println(" <fileset dir=\"target\"/>");
- pw.println(" </delete>");
+ pw.println(" <delete dir=\"target\" includeemptydirs=\"true\"/>");
pw.println(" </target>");
pw.println();
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-webapp/build.xml
index 3247521fe3..ec0fe27f85 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/catalog-webapp/build.xml
@@ -39,9 +39,7 @@
<target name="package" depends="compile"/>
<target name="clean">
- <delete includeemptydirs="true">
- <fileset dir="." includes="target/**"/>
- </delete>
+ <delete dir="target" includeemptydirs="true"/>
</target>
<fileset id="tutorial-assets-jar" dir="../assets/target">
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/build.xml
index 208878c7ae..e70d849752 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/warehouse-spring/build.xml
@@ -44,9 +44,7 @@
<target name="package" depends="compile"/>
<target name="clean">
- <delete includeemptydirs="true">
- <fileset dir="." includes="target/**"/>
- </delete>
+ <delete dir="target" includeemptydirs="true"/>
</target>
<fileset id="tutorial-assets-jar" dir="../assets/target">