Author: germuska
Date: Sun Feb 13 12:53:25 2005
New Revision: 153663
URL: http://svn.apache.org/viewcvs?view=rev&rev=153663
Log:
Add checks to see if directories are available before copying; remove spaces
from
goal specs in maven:reactor tags.
I now get a clean build (maven:dist) but haven't got much time to see if that's
really
all that's needed to make this useful.
Modified:
struts/apps/trunk/maven.xml
Modified: struts/apps/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/maven.xml?view=diff&r1=153662&r2=153663
==============================================================================
--- struts/apps/trunk/maven.xml (original)
+++ struts/apps/trunk/maven.xml Sun Feb 13 12:53:25 2005
@@ -16,7 +16,7 @@
<maven:reactor basedir="${basedir}"
includes="shared/project.xml"
- goals="java:compile, war:webapp, war:war"
+ goals="java:compile,war:webapp,war:war"
banner="Building default mailreader app"
ignoreFailures="false"/>
@@ -27,7 +27,7 @@
<maven:reactor basedir="${basedir}"
includes="*/project.xml"
excludes="shared/project.xml, dao/project.xml"
- goals="java:compile, war:webapp, war:war"
+ goals="java:compile,war:webapp,war:war"
banner="Building Struts apps"
ignoreFailures="false"/>
@@ -46,24 +46,31 @@
</preGoal>
<postGoal name="war:webapp">
- <!--
- TODO add test here to see if the ${core.dist.lib.dir}
- and .tld / .dtd are available
-
+ <!-- is this necessary, or nice-to-have? -->
+ <ant:available file="${core.dist.lib.dir}"
property="core.dist.available" />
+ <j:if test="${core.dist.available}">
+ <ant:copy todir="${maven.war.webapp.dir}/WEB-INF"
overwrite="false">
+ <ant:fileset dir="${core.dist.lib.dir}"
+ includes="*.tld, *.dtd">
+ </ant:fileset>
+ </ant:copy>
+ </j:if>
+ <j:if test="${not core.dist.available}">
+ <ant:echo>WARNING: ${core.dist.lib.dir} not available; TLDs
and DTDs will not be copied.</ant:echo>
+ </j:if>
- -->
-
- <ant:copy todir="${maven.war.webapp.dir}/WEB-INF"
overwrite="false">
- <ant:fileset dir="${core.dist.lib.dir}"
- includes="*.tld, *.dtd">
- </ant:fileset>
- </ant:copy>
-
- <ant:copy todir="${maven.war.webapp.dir}/WEB-INF"
overwrite="false">
- <ant:fileset dir="${core.conf.share.dir}"
- includes="*.xml">
- </ant:fileset>
- </ant:copy>
+ <!-- is this necessary, or nice-to-have? -->
+ <ant:available file="${core.conf.share.dir}"
property="core.share.available" />
+ <j:if test="${core.share.available}">
+ <ant:copy todir="${maven.war.webapp.dir}/WEB-INF"
overwrite="false">
+ <ant:fileset dir="${core.conf.share.dir}"
+ includes="*.xml">
+ </ant:fileset>
+ </ant:copy>
+ </j:if>
+ <j:if test="${not core.share.available}">
+ <ant:echo>WARNING: ${core.conf.share.dir} not available;
some XML config files will not be copied.</ant:echo>
+ </j:if>
<j:if test="${pom.name.indexOf('mailreader-') != '-1'}">
<j:if test="${pom.name.indexOf('dao') == '-1'}">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
