Author: ekoneil
Date: Wed Mar 16 17:02:39 2005
New Revision: 157841
URL: http://svn.apache.org/viewcvs?view=rev&rev=157841
Log:
Exclude the web.xml files during a <war> call so that the webapps pick-up the
correct deployment descriptor.
BB: self
DRT: none
Test: ensure that the right web.xml is picked up
Modified:
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml
incubator/beehive/trunk/user/netui-blank/build.xml
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml?view=diff&r1=157840&r2=157841
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml
(original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml Wed
Mar 16 17:02:39 2005
@@ -96,6 +96,7 @@
<!-- this does *not* exclude source from the archive -->
<war destfile="${archive.dir}/${context.path}.war"
webxml="${webapp.dir}/WEB-INF/web.xml">
<fileset dir="${webapp.dir}">
+ <exclude name="WEB-INF/web.xml"/>
<exclude name="WEB-INF/src/**"/>
</fileset>
</war>
Modified: incubator/beehive/trunk/user/netui-blank/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/netui-blank/build.xml?view=diff&r1=157840&r2=157841
==============================================================================
--- incubator/beehive/trunk/user/netui-blank/build.xml (original)
+++ incubator/beehive/trunk/user/netui-blank/build.xml Wed Mar 16 17:02:39 2005
@@ -96,6 +96,7 @@
<!-- this does *not* exclude source from the archive -->
<war destfile="${archive.dir}/${context.path}.war"
webxml="${webapp.dir}/WEB-INF/web.xml">
<fileset dir="${webapp.dir}">
+ <exclude name="WEB-INF/web.xml"/>
<exclude name="WEB-INF/src/**"/>
</fileset>
</war>
