Author: ate
Date: Sun Feb 25 13:55:28 2007
New Revision: 511633
URL: http://svn.apache.org/viewvc?view=rev&rev=511633
Log:
Prevent 5x copying and deleting pages and min-pages folder.
maven-1 is repeating the postGoal for war:webapp because we use inheritance of
the project.xml (5x)
Modified:
portals/jetspeed-2/trunk/maven.xml
Modified: portals/jetspeed-2/trunk/maven.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven.xml?view=diff&rev=511633&r1=511632&r2=511633
==============================================================================
--- portals/jetspeed-2/trunk/maven.xml (original)
+++ portals/jetspeed-2/trunk/maven.xml Sun Feb 25 13:55:28 2007
@@ -243,12 +243,18 @@
<postGoal name="war:webapp">
<available
file="${maven.build.dir}/jetspeed/WEB-INF/min-pages/" property="inRightDir"/>
<j:if test="${inRightDir == 'true'}">
- <j:if test="${demoBuild != 'true'}">
- <delete
dir="${maven.build.dir}/jetspeed/WEB-INF/pages"/>
- <copy todir="${maven.build.dir}/jetspeed/WEB-INF/pages/">
+ <j:if test="${demoBuild != 'true'}">
+ <j:new var="file" className="java.io.File">
+ <j:arg value="${maven.build.dir}/jetspeed/WEB-INF/min-pages"
/>
+ </j:new>
+ <j:if test="${file.exists()}">
+ <delete dir="${maven.build.dir}/jetspeed/WEB-INF/pages"/>
+ <copy todir="${maven.build.dir}/jetspeed/WEB-INF/pages/">
<fileset
dir="${maven.build.dir}/jetspeed/WEB-INF/min-pages/"/>
- </copy>
- </j:if>
+ </copy>
+ <delete dir="${maven.build.dir}/jetspeed/WEB-INF/min-pages"/>
+ </j:if>
+ </j:if>
</j:if>
</postGoal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
