jvanzyl 2003/01/09 07:42:21
Modified: src/conf driver.jelly
Log:
o Adding a check to the resource processing to ignore non-existent
directories.
Revision Changes Path
1.6 +31 -21 jakarta-turbine-maven/src/conf/driver.jelly
Index: driver.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/conf/driver.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- driver.jelly 12 Dec 2002 00:45:30 -0000 1.5
+++ driver.jelly 9 Jan 2003 15:42:21 -0000 1.6
@@ -3,6 +3,7 @@
<project
xmlns:j="jelly:core"
xmlns:define="jelly:define"
+ xmlns:util="jelly:util"
xmlns:resources="resources"
xmlns:m="maven">
@@ -54,27 +55,36 @@
<define:tag name="copy">
<j:forEach var="resource" items="${resources}">
- <j:choose>
- <j:when test="${resource.targetPath ==''}">
- <j:set var="targetDirectory" value="${todir}"/>
- </j:when>
- <j:otherwise>
- <j:set var="targetDirectory" value="${todir}/${resource.targetPath}"/>
- </j:otherwise>
- </j:choose>
- <copy todir="${targetDirectory}">
- <fileset dir="${resource.directory}">
- <j:if test="${resources.includes.isEmpty()}">
- <include name="**/**"/>
- </j:if>
- <j:forEach var="include" items="${resource.includes}">
- <include name="${include}"/>
- </j:forEach>
- <j:forEach var="exclude" items="${resource.excludes}">
- <exclude name="${exclude}"/>
- </j:forEach>
- </fileset>
- </copy>
+
+ <j:set var="resourceDirectoryPresent" value="false"/>
+
+ <util:available file="${resource.directory}">
+ <j:set var="resourceDirectoryPresent" value="true"/>
+ </util:available>
+
+ <j:if test="${resourceDirectoryPresent == 'true'}">
+ <j:choose>
+ <j:when test="${resource.targetPath ==''}">
+ <j:set var="targetDirectory" value="${todir}"/>
+ </j:when>
+ <j:otherwise>
+ <j:set var="targetDirectory"
value="${todir}/${resource.targetPath}"/>
+ </j:otherwise>
+ </j:choose>
+ <copy todir="${targetDirectory}">
+ <fileset dir="${resource.directory}">
+ <j:if test="${resources.includes.isEmpty()}">
+ <include name="**/**"/>
+ </j:if>
+ <j:forEach var="include" items="${resource.includes}">
+ <include name="${include}"/>
+ </j:forEach>
+ <j:forEach var="exclude" items="${resource.excludes}">
+ <exclude name="${exclude}"/>
+ </j:forEach>
+ </fileset>
+ </copy>
+ </j:if>
</j:forEach>
</define:tag>
</define:taglib>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
