[seam-commits] Seam SVN: r9336 - in trunk/seam-gen: icefaces/build-scripts and 1 other directory.

[seam-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2008-10-15 04:59:59 -0400 (Wed, 15 Oct 2008)
New Revision: 9336

Modified:
   trunk/seam-gen/build-scripts/build-war.xml
   trunk/seam-gen/build-scripts/build.xml
   trunk/seam-gen/icefaces/build-scripts/build-war.xml
   trunk/seam-gen/icefaces/build-scripts/build.xml
Log:
remove exploded-archives directory on clean
sync rather than copy during explode (cleans up dangling files)


Modified: trunk/seam-gen/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/build-scripts/build-war.xml	2008-10-15 08:54:22 UTC (rev 9335)
+++ trunk/seam-gen/build-scripts/build-war.xml	2008-10-15 08:59:59 UTC (rev 9336)
@@ -248,9 +248,9 @@
         <fail unless="jboss.home">jboss.home not set</fail>
         
         <mkdir dir="${war.deploy.dir}"/>
-        <copy todir="${war.deploy.dir}">
+        <sync todir="${war.deploy.dir}">
             <fileset dir="${war.dir}"/>
-        </copy>
+        </sync>
     </target>
     
     <target name="unexplode" description="Undeploy the exploded archive">
@@ -300,7 +300,7 @@
     
     <target name="clean" description="Clean out the staging directory">
         <delete dir="${dist.dir}"/>
-        <delete dir="${war.dir}"/>
+        <delete dir="${basedir}/exploded-archives"/>
         <delete dir="${basedir}/test-report"/>
         <delete dir="${basedir}/test-output"/>
         <delete failonerror="no" includeemptydirs="true">

Modified: trunk/seam-gen/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/build-scripts/build.xml	2008-10-15 08:54:22 UTC (rev 9335)
+++ trunk/seam-gen/build-scripts/build.xml	2008-10-15 08:59:59 UTC (rev 9336)
@@ -254,15 +254,15 @@
                 <mkdir dir="${jar.deploy.dir}"/>
                 <mkdir dir="${war.deploy.dir}"/>                
                 
-                <copy todir="${jar.deploy.dir}">
+                <sync todir="${jar.deploy.dir}">
                         <fileset dir="${jar.dir}"/>
-                </copy>
-                <copy todir="${war.deploy.dir}">
+                </sync>
+                <sync todir="${war.deploy.dir}">
                         <fileset dir="${war.dir}"/>
-                </copy>
-                <copy todir="${ear.deploy.dir}">
+                </sync>
+                <sync todir="${ear.deploy.dir}">
                         <fileset dir="${ear.dir}"/>
-                </copy>
+                </sync>
         </target>
 
         <target name="unexplode" description="Undeploy the exploded archive">
@@ -312,9 +312,7 @@
 
         <target name="clean" description="Cleans up the staging directory">
                 <delete dir="${dist.dir}"/>
-                <delete dir="${ear.dir}"/>
-                <delete dir="${war.dir}"/>
-                <delete dir="${jar.dir}"/>
+                <delete dir="${basedir}/exploded-archives"/>
                 <delete dir="${src.schema.dir}" failonerror="no"/>
                 <delete dir="${basedir}/test-report"/>
                 <delete dir="${basedir}/test-output"/>

Modified: trunk/seam-gen/icefaces/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/build-war.xml	2008-10-15 08:54:22 UTC (rev 9335)
+++ trunk/seam-gen/icefaces/build-scripts/build-war.xml	2008-10-15 08:59:59 UTC (rev 9336)
@@ -242,9 +242,9 @@
         <fail unless="jboss.home">jboss.home not set</fail>
         
         <mkdir dir="${war.deploy.dir}"/>
-        <copy todir="${war.deploy.dir}">
+        <sync todir="${war.deploy.dir}">
             <fileset dir="${war.dir}"/>
-        </copy>
+        </sync>
     </target>
     
     <target name="unexplode" description="Undeploy the exploded archive">
@@ -294,7 +294,7 @@
     
     <target name="clean" description="Clean out the staging directory">
         <delete dir="${dist.dir}"/>
-        <delete dir="${war.dir}"/>
+        <delete dir="${basedir}/exploded-archives"/>
         <delete dir="${basedir}/test-report"/>
         <delete dir="${basedir}/test-output"/>
         <delete failonerror="no" includeemptydirs="true">

Modified: trunk/seam-gen/icefaces/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/build.xml	2008-10-15 08:54:22 UTC (rev 9335)
+++ trunk/seam-gen/icefaces/build-scripts/build.xml	2008-10-15 08:59:59 UTC (rev 9336)
@@ -249,15 +249,15 @@
                 <mkdir dir="${jar.deploy.dir}"/>
                 <mkdir dir="${war.deploy.dir}"/>                
                 
-                <copy todir="${jar.deploy.dir}">
+                <sync todir="${jar.deploy.dir}">
                         <fileset dir="${jar.dir}"/>
-                </copy>
-                <copy todir="${war.deploy.dir}">
+                </sync>
+                <sync todir="${war.deploy.dir}">
                         <fileset dir="${war.dir}"/>
-                </copy>
-                <copy todir="${ear.deploy.dir}">
+                </sync>
+                <sync todir="${ear.deploy.dir}">
                         <fileset dir="${ear.dir}"/>
-                </copy>
+                </sync>
         </target>
 
         <target name="unexplode" description="Undeploy the exploded archive">
@@ -307,9 +307,7 @@
 
         <target name="clean" description="Cleans up the staging directory">
                 <delete dir="${dist.dir}"/>
-                <delete dir="${ear.dir}"/>
-                <delete dir="${war.dir}"/>
-                <delete dir="${jar.dir}"/>
+                <delete dir="${basedir}/exploded-archives"/>
                 <delete dir="${src.schema.dir}" failonerror="no"/>
                 <delete dir="${basedir}/test-report"/>
                 <delete dir="${basedir}/test-output"/>