Author: veithen
Date: Sun Aug 8 08:47:23 2010
New Revision: 983363
URL: http://svn.apache.org/viewvc?rev=983363&view=rev
Log:
Properly add NOTICE.txt, LICENSE.txt, README.txt and release-notes.html to the
binary and source distributions. Note that the first three files don't require
variable substitution and that the last file should not require variable
substitution (although it does for the moment).
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=983363&r1=983362&r2=983363&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
(original)
+++
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
Sun Aug 8 08:47:23 2010
@@ -153,7 +153,7 @@
</fileSet>
<fileSet>
- <directory>target/tmp-doc-distro/docs</directory>
+ <directory>../..</directory>
<outputDirectory></outputDirectory>
<includes>
<include>LICENSE.txt</include>
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml?rev=983363&r1=983362&r2=983363&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml
(original)
+++
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml
Sun Aug 8 08:47:23 2010
@@ -37,6 +37,10 @@
<include>modules/**</include>
<include>legal/**</include>
<include>release-docs/**</include>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ <include>README.txt</include>
+ <include>release-notes.html</include>
</includes>
<excludes>
@@ -85,23 +89,6 @@
</fileSet>
-
- <fileSet>
- <directory>target/tmp-doc-distro/docs</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>NOTICE.txt</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>target/tmp-doc-distro/docs</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>LICENSE.txt</include>
- </includes>
- </fileSet>
-
<!-- copying tools section of xdocs. This is needed by eclipse plugins
-->
<fileSet>
<directory>../../xdocs</directory>
