From 49ffa3fb909dcb3dcaa6d26fd3a056214dd72b27 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 25 Oct 2010 09:41:33 +0000
Subject: Merge r998257 Fix code for clean target in generated build.xml files
 (TUSCANY-3680)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027005 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java      | 4 +---
 sca-java-1.x/trunk/tutorials/store/catalog-webapp/build.xml           | 4 +---
 sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml         | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'sca-java-1.x/trunk')

diff --git a/sca-java-1.x/trunk/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java b/sca-java-1.x/trunk/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/trunk/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
+++ b/sca-java-1.x/trunk/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/trunk/tutorials/store/catalog-webapp/build.xml b/sca-java-1.x/trunk/tutorials/store/catalog-webapp/build.xml
index 3247521fe3..ec0fe27f85 100644
--- a/sca-java-1.x/trunk/tutorials/store/catalog-webapp/build.xml
+++ b/sca-java-1.x/trunk/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/trunk/tutorials/store/warehouse-spring/build.xml b/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml
index 208878c7ae..e70d849752 100644
--- a/sca-java-1.x/trunk/tutorials/store/warehouse-spring/build.xml
+++ b/sca-java-1.x/trunk/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">
-- 
cgit v1.2.3