TUSCANY-3680: Fix code in "clean" target

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1002838 13f79535-47bb-0310-9956-ffa450edef68

52 files changed, 129 insertions, 241 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-echo-extension/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-echo-extension/build.xml
index 5df5981bea..e67700d2e0 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-echo-extension/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-echo-extension/build.xml
@@ -44,8 +44,6 @@
     </target>	
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-echo/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-echo/build.xml
index 7689ef3a54..b09290837e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-echo/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-echo/build.xml
@@ -68,8 +68,6 @@
     </target>	
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-broker/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-broker/build.xml
index dd3ed8eaea..7c7be663a0 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-broker/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-broker/build.xml
@@ -68,8 +68,6 @@
     </target>

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-consumer/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-consumer/build.xml
index b4ddaa3aec..06e12fdad6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-consumer/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-consumer/build.xml
@@ -68,8 +68,6 @@
     </target>

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-producer/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-producer/build.xml
index 6908a306b8..9d3ec716cc 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-producer/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/binding-notification-producer/build.xml
@@ -68,8 +68,6 @@
     </target>

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-corba-reference/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-corba-reference/build.xml
index 066bb289ea..e1633e0b7e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-corba-reference/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-corba-reference/build.xml
@@ -65,8 +65,6 @@
     </target>
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-corba-service/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-corba-service/build.xml
index 9720cef593..c6216dcfc2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-corba-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-corba-service/build.xml
@@ -65,8 +65,6 @@
     </target>
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-distributed/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-distributed/build.xml
index a69c7c2f96..5e424a81a4 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-distributed/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-distributed/build.xml
@@ -92,10 +92,6 @@
     </target>	
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>	
-	
-	
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-implementation-policies/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-implementation-policies/build.xml
index 4a87474657..2bc335fae2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-implementation-policies/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-implementation-policies/build.xml
@@ -65,8 +65,6 @@
     </target>	

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-rmi-reference/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-rmi-reference/build.xml
index ca75625b42..8c4ada4704 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-rmi-reference/build.xml
@@ -66,8 +66,6 @@
     </target>

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-rmi-service/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-rmi-service/build.xml
index f98f35e4b0..6de535e1fc 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-rmi-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-rmi-service/build.xml
@@ -65,8 +65,6 @@
     </target>
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-script/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-script/build.xml
index 429d638ca5..b58578014c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-script/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator-script/build.xml
@@ -65,8 +65,6 @@
     </target>
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator/build.xml
index c4b755ef94..a45cf9589e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/calculator/build.xml
@@ -65,8 +65,6 @@
     </target>	
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/callback-ws-client/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/callback-ws-client/build.xml
index 8698c6018d..0fada69531 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/callback-ws-client/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/callback-ws-client/build.xml
@@ -66,8 +66,6 @@
     </target>

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/callback-ws-service/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/callback-ws-service/build.xml
index c91dd88a8c..e533c5f309 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/callback-ws-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/callback-ws-service/build.xml
@@ -66,8 +66,6 @@
     </target>

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/callbacks-jms/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/callbacks-jms/build.xml
index bc2c191fc2..3a78845e99 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/callbacks-jms/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/callbacks-jms/build.xml
@@ -65,8 +65,6 @@
     </target>	

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo-webapp/build.xml
index ca448e7fb5..db10db5adf 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo-webapp/build.xml
@@ -60,10 +60,6 @@
     <target name="package" depends="compile"/>
 
     <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
-
-
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo/build.xml
index d1d1a3dec7..d2b0c0a3d7 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/customer-dojo/build.xml
@@ -60,10 +60,6 @@
     <target name="package" depends="compile"/>
 
     <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
-
-
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/databinding-echo/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/databinding-echo/build.xml
index 10423e4144..d1bffa6ff6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/databinding-echo/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/databinding-echo/build.xml
@@ -68,8 +68,6 @@
     </target>
 
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/domain-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/domain-webapp/build.xml
index 788b6dc589..eb4d1b6348 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/domain-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/domain-webapp/build.xml
@@ -101,9 +101,7 @@
     </target>	

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>	

 	

 	<!-- If you want to test without building the distribution jars set the       -->

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/feed-aggregator/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/feed-aggregator/build.xml
index 0ab6fed7fc..c7edbaf8a9 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/feed-aggregator/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/feed-aggregator/build.xml
@@ -65,8 +65,6 @@
     </target>	
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-reference-jms/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-reference-jms/build.xml
index 4702beed0d..ff53ca2fc7 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-reference-jms/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-reference-jms/build.xml
@@ -65,8 +65,6 @@
     </target>

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-service-jms/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-service-jms/build.xml
index a44c71843e..0b5fd56208 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-service-jms/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-service-jms/build.xml
@@ -65,8 +65,6 @@
     </target>

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-deep-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-deep-webapp/build.xml
index ef0a85281d..7d409f3ddc 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-deep-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-deep-webapp/build.xml
@@ -151,8 +151,6 @@
      </target>

 		

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-jms/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-jms/build.xml
index 4f83c8ae9d..e18e984c76 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-jms/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-jms/build.xml
@@ -65,8 +65,6 @@
     </target>
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-secure/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-secure/build.xml
index 38f1b7549d..319353c315 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-secure/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference-secure/build.xml
@@ -65,8 +65,6 @@
     </target>

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference/build.xml
index 71ee66b31e..7d5556cd42 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-reference/build.xml
@@ -65,8 +65,6 @@
     </target>
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo-webapp/build.xml
index 386008e707..cac3a0857c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo-webapp/build.xml
@@ -92,8 +92,6 @@
     <target name="package" depends="compile"/>
 		
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo/build.xml
index afa1a0a9d3..2439a35b35 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-sdo/build.xml
@@ -108,8 +108,6 @@
     </target>
 		
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-jms/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-jms/build.xml
index 330de7f7e5..cc463c2a87 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-jms/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-jms/build.xml
@@ -65,8 +65,6 @@
     </target>

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-secure/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-secure/build.xml
index 29bbae0173..80aff96f53 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-secure/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-secure/build.xml
@@ -65,8 +65,6 @@
     </target>

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-webapp/build.xml
index e420d3f4ab..dfbcfc47a2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-webapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service-webapp/build.xml
@@ -150,8 +150,6 @@
     <target name="package" depends="compile"/>

 		

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service/build.xml
index 46678febc3..a20d938748 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/helloworld-ws-service/build.xml
@@ -65,8 +65,6 @@
     </target>
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/holder-ws-service/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/holder-ws-service/build.xml
index 12d466172b..986e1b9cb3 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/holder-ws-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/holder-ws-service/build.xml
@@ -65,8 +65,6 @@
     </target>
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-composite/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-composite/build.xml
index 7aa31aab8b..11eecc4d06 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-composite/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-composite/build.xml
@@ -65,8 +65,6 @@
     </target>
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-crud-extension/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-crud-extension/build.xml
index 88d308e6fc..fcc0615f7e 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-crud-extension/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-crud-extension/build.xml
@@ -44,8 +44,6 @@
     </target>	
 		
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-crud/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-crud/build.xml
index 10b26b5a94..dbe7992883 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-crud/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-crud/build.xml
@@ -68,8 +68,6 @@
     </target>	
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-notification/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-notification/build.xml
index 110c7b84c1..536114f4bc 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-notification/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-notification/build.xml
@@ -65,8 +65,6 @@
     </target>

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/osgi-supplychain/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/osgi-supplychain/build.xml
index b774e30caf..2de08e74a3 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/osgi-supplychain/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/osgi-supplychain/build.xml
@@ -121,8 +121,6 @@
     </target>    
     
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/photo-gallery/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/photo-gallery/build.xml
index 765f853f38..b75baac6da 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/photo-gallery/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/photo-gallery/build.xml
@@ -68,9 +68,7 @@
     </target>	
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
     
     <fileset id="3rdparty.jars" dir="../../lib">
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-bigbank-spring/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-bigbank-spring/build.xml
index ecc2596d71..7efd47d409 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-bigbank-spring/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-bigbank-spring/build.xml
@@ -65,8 +65,6 @@
     </target>
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-bigbank/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-bigbank/build.xml
index a814014eae..823fe74168 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-bigbank/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-bigbank/build.xml
@@ -65,8 +65,6 @@
     </target>
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-callback-ws/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-callback-ws/build.xml
index 10b69bd395..83173f56a5 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-callback-ws/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-callback-ws/build.xml
@@ -65,8 +65,6 @@
     </target>
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-callback/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-callback/build.xml
index 47d1ea4bc1..ccfb5cd63f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-callback/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/simple-callback/build.xml
@@ -65,8 +65,6 @@
     </target>
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-calculator/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-calculator/build.xml
index 810cd5f408..92eb9cc417 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-calculator/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-calculator/build.xml
@@ -65,8 +65,6 @@
     </target>

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

-</project>
\ No newline at end of file
+</project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-checkaccount/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-checkaccount/build.xml
index 41389e8a2d..dbf2addcc4 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-checkaccount/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-checkaccount/build.xml
@@ -66,8 +66,6 @@
     </target>

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-stockquote/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-stockquote/build.xml
index f705ffd593..2e0300ed8c 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-stockquote/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/spring-bigbank-stockquote/build.xml
@@ -65,9 +65,6 @@
     </target>

 	

     <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+        <delete dir="target" includeemptydirs="true"/>

     </target>

 </project>

-

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/store-secure/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/store-secure/build.xml
index de90eacb2f..f034a658de 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/store-secure/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/store-secure/build.xml
@@ -1,79 +1,77 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<project name="store" default="compile">

-    <property name="test.class" value="launch.Launch" />

-	<property name="test.jar"   value="sample-store-secure.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            	<fileset refid="3rdparty.jars"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            	<fileset refid="3rdparty.jars"/>

-            </classpath>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-            	<pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            	<fileset refid="3rdparty.jars"/>

-            </classpath>

-        </java>    	

-    </target>	

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-    

-    <fileset id="3rdparty.jars" dir="../../lib">

-        <include name="saxon-8.7.jar"/>

-    </fileset>

-</project>

+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project name="store" default="compile">
+    <property name="test.class" value="launch.Launch" />
+	<property name="test.jar"   value="sample-store-secure.jar" />
+	
+    <target name="init">
+        <mkdir dir="target/classes"/>
+    </target>
+	
+    <target name="compile" depends="init">
+        <javac srcdir="src/main/java"
+               destdir="target/classes"
+               debug="on"
+               source="1.5"
+               target="1.5">
+            <classpath>
+            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+            	<fileset refid="3rdparty.jars"/>
+            </classpath>
+        </javac> 
+        <copy todir="target/classes">
+            <fileset dir="src/main/resources"/>
+        </copy>
+        <jar destfile="target/${test.jar}" basedir="target/classes">
+            <manifest>
+                <attribute name="Main-Class" value="${test.class}" /> 
+            </manifest>
+        </jar>    	
+    </target>	
+	
+    <target name="run-classes">
+        <java classname="${test.class}"
+              fork="true">
+            <classpath>
+                <pathelement path="target/classes"/>
+            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+            	<fileset refid="3rdparty.jars"/>
+            </classpath>
+        </java>
+    </target>
+	
+    <target name="run">
+        <java classname="${test.class}"
+              fork="true">
+            <classpath>
+            	<pathelement path="target/${test.jar}"/>
+            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+            	<fileset refid="3rdparty.jars"/>
+            </classpath>
+        </java>    	
+    </target>	
+	
+    <target name="clean">
+        <delete dir="target" includeemptydirs="true"/>
+    </target>
+    
+    <fileset id="3rdparty.jars" dir="../../lib">
+        <include name="saxon-8.7.jar"/>
+    </fileset>
+</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/store/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/store/build.xml
index dec09d5dc2..590f10b48f 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/store/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/store/build.xml
@@ -68,9 +68,7 @@
     </target>	
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
     
     <fileset id="3rdparty.jars" dir="../../lib">
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/supplychain/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/supplychain/build.xml
index 506180b8b1..6651359d20 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/supplychain/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/supplychain/build.xml
@@ -65,8 +65,6 @@
     </target>	
 	
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/web-resource/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/web-resource/build.xml
index 5f6b6091e7..c196416dd8 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/web-resource/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/web-resource/build.xml
@@ -65,8 +65,6 @@
     </target>
 
     <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
+        <delete dir="target" includeemptydirs="true"/>
     </target>
 </project>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/samples/zipcode-jaxws/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/zipcode-jaxws/build.xml
index 20f2cd8f67..a561ebf456 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/samples/zipcode-jaxws/build.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/samples/zipcode-jaxws/build.xml
@@ -64,9 +64,6 @@
 	</target>
 
 	<target name="clean">
-		<delete includeemptydirs="true">
-			<fileset dir="target"/>
-		</delete>
+        <delete dir="target" includeemptydirs="true"/>
 	</target>
-
 </project>