Author: psharples
Date: Tue Oct 18 14:04:00 2011
New Revision: 1185667
URL: http://svn.apache.org/viewvc?rev=1185667&view=rev
Log:
We missed an observation made by Ate in WOOKIE-250.
'wookie.war has DISCLAIMER/LICENSE/NOTICE/RUNTIME_LICENSE files in root folder:
Having these files in the war root means these will be accessible as web
resources... While still pretty harmless in this case/release, its a bad
practice and could actually pose a security issue as everyone can thereby
find/read which runtime artifacts (including there version) are in use. The
expected/advised location for these files would be under /META-INF.'
This commit puts those files under the /META-INF folder as suggested.
Modified:
incubator/wookie/trunk/ant/ivy-release-common.xml
Modified: incubator/wookie/trunk/ant/ivy-release-common.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/ant/ivy-release-common.xml?rev=1185667&r1=1185666&r2=1185667&view=diff
==============================================================================
--- incubator/wookie/trunk/ant/ivy-release-common.xml (original)
+++ incubator/wookie/trunk/ant/ivy-release-common.xml Tue Oct 18 14:04:00 2011
@@ -115,11 +115,13 @@
</filterset>
</copy>
+ <!--
<copy file="DISCLAIMER"
tofile="${build.dir}/webapp/wookie/DISCLAIMER" overwrite="yes" />
<copy file="NEW_AND_NOTEWORTHY"
tofile="${build.dir}/webapp/wookie/NEW_AND_NOTEWORTHY" overwrite="yes" />
<copy file="UPGRADING" tofile="${build.dir}/webapp/wookie/UPGRADING"
overwrite="yes" />
<copy file="etc/release/war/LICENSE"
tofile="${build.dir}/webapp/wookie/LICENSE" overwrite="yes" />
-
+ -->
+
<!-- build war file -->
<war
destfile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/wookie.war"
@@ -132,6 +134,14 @@
<exclude name="WEB-INF/classes/" />
<exclude name="WEB-INF/lib/" />
</fileset>
+ <metainf dir=".">
+ <include name="NOTICE"/>
+ <include name="DISCLAIMER"/>
+ <include name="UPGRADING"/>
+ </metainf>
+ <metainf dir="etc/release/war/">
+ <include name="LICENSE"/>
+ </metainf>
</war>
<!-- put original widgetserver.properties file back -->
@@ -139,8 +149,11 @@
tofile="${build.dir}/webapp/wookie/WEB-INF/classes/widgetserver.properties"
overwrite="true" />
<delete file="${build.dir}/widgetserver.properties" />
+
+ <!--
<delete file="${build.dir}/webapp/wookie/DISCLAIMER" />
<delete file="${build.dir}/webapp/wookie/LICENSE" />
+ -->
<!-- copy sql scripts across -->
<copy
todir="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/scripts/">
@@ -151,7 +164,6 @@
<!-- copy over project readme files-->
<copy file="DISCLAIMER"
tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/DISCLAIMER"
overwrite="yes" />
- <!--<copy file="KEYS"
tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/KEYS"
overwrite="yes" />-->
<copy file="etc/release/war/LICENSE"
tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/LICENSE"
overwrite="yes" />
<copy file="README"
tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/README"
overwrite="yes" />
<copy file="RELEASE_NOTES"
tofile="${wookie.release.dir}/${version}-incubating/binary/war/${wookie.war.folder.name}/build/RELEASE_NOTES"
overwrite="yes" />
