Author: wsmoak
Date: Sat Sep 10 12:04:22 2005
New Revision: 280024
URL: http://svn.apache.org/viewcvs?rev=280024&view=rev
Log:
Rearranged logic to make Ant stop complaining about core/conf/java not being
available (it is). Removed section that copied files from core/dist/lib (which
doesn't exist).
Modified:
struts/apps/trunk/maven.xml
Modified: struts/apps/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/maven.xml?rev=280024&r1=280023&r2=280024&view=diff
==============================================================================
--- struts/apps/trunk/maven.xml (original)
+++ struts/apps/trunk/maven.xml Sat Sep 10 12:04:22 2005
@@ -42,31 +42,20 @@
</preGoal>
<postGoal name="war:webapp">
- <!-- 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>
-
- <!-- is this necessary, or nice-to-have? -->
+ <!-- copy config files from core -->
<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}">
+ <j:choose>
+ <j:when 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:when>
+ <j:otherwise>
<ant:echo>WARNING: ${core.conf.share.dir} not available;
some XML config files will not be copied.</ant:echo>
- </j:if>
+ </j:otherwise>
+ </j:choose>
<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]
