Author: psharples
Date: Wed Jan 23 14:25:30 2013
New Revision: 1437403
URL: http://svn.apache.org/viewvc?rev=1437403&view=rev
Log:
Fixed 2 issues - 1. task was unintentionally copying all source files into the
maven war archive. 2. Widgets were not being added to the maven wars deploy
folder properly.
Modified:
wookie/trunk/ant/ivy-java-common.xml
Modified: wookie/trunk/ant/ivy-java-common.xml
URL:
http://svn.apache.org/viewvc/wookie/trunk/ant/ivy-java-common.xml?rev=1437403&r1=1437402&r2=1437403&view=diff
==============================================================================
--- wookie/trunk/ant/ivy-java-common.xml (original)
+++ wookie/trunk/ant/ivy-java-common.xml Wed Jan 23 14:25:30 2013
@@ -294,7 +294,7 @@
<antcall target="post-deploy-webapp-widgets-extra"/>
<!-- copy them into the maven webapp -->
<copy todir="${build.dir}/maven-webapp/wookie/deploy">
- <fileset dir="${build.dir}/widgets"/>
+ <fileset dir="${build.dir}/webapp/wookie/deploy"/>
</copy>
<!-- build war file -->
@@ -308,8 +308,7 @@
<exclude name="WEB-INF/classes/" />
<exclude name="WEB-INF/lib/" />
</fileset>
- <metainf dir=".">
- </metainf>
+
<metainf dir="etc/release/maven/war/">
<include name="LICENSE"/>
<include name="NOTICE"/>