Author: vinoski
Date: Thu Jan 4 21:09:49 2007
New Revision: 492902
URL: http://svn.apache.org/viewvc?view=rev&rev=492902
Log:
moved some distribution files
moved some files around underneath the distribution directory, and changed
some assemblies to pick them up
Added:
incubator/qpid/trunk/qpid/java/distribution/src/main/release/LICENSE.txt
- copied unchanged from r489214,
incubator/qpid/trunk/qpid/java/LICENSE.txt
incubator/qpid/trunk/qpid/java/distribution/src/main/release/NOTICE.txt
- copied unchanged from r489214, incubator/qpid/trunk/qpid/java/NOTICE.txt
incubator/qpid/trunk/qpid/java/distribution/src/main/release/README.txt
- copied unchanged from r489214, incubator/qpid/trunk/qpid/java/README.txt
Removed:
incubator/qpid/trunk/qpid/java/LICENSE.txt
incubator/qpid/trunk/qpid/java/NOTICE.txt
incubator/qpid/trunk/qpid/java/README.txt
Modified:
incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin.xml
incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/client-bin.xml
incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/src.xml
Modified: incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin.xml?view=diff&rev=492902&r1=492901&r2=492902
==============================================================================
--- incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin.xml
(original)
+++ incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin.xml Thu
Jan 4 21:09:49 2007
@@ -31,14 +31,17 @@
<directory>src/main/release</directory>
<outputDirectory>qpid-${qpid.version}</outputDirectory>
<includes>
- <include>DISCLAIMER</include>
+ <include>DISCLAIMER</include>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>README.txt</include>
</includes>
</fileSet>
<fileSet>
<directory>..</directory>
<outputDirectory>qpid-${qpid.version}</outputDirectory>
<includes>
- <include>*.txt</include>
+ <include>*.txt</include>
</includes>
</fileSet>
<fileSet>
@@ -53,14 +56,14 @@
<directory>src/main/release/docs</directory>
<outputDirectory>qpid-${qpid.version}/docs</outputDirectory>
<includes>
- <include>RELEASE_NOTES.txt</include>
+ <include>RELEASE_NOTES.txt</include>
</includes>
</fileSet>
<fileSet>
<directory>target</directory>
<outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
<includes>
- <include>qpid-incubating.jar</include>
+ <include>qpid-incubating.jar</include>
</includes>
</fileSet>
</fileSets>
Modified:
incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/client-bin.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/client-bin.xml?view=diff&rev=492902&r1=492901&r2=492902
==============================================================================
---
incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/client-bin.xml
(original)
+++
incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/client-bin.xml
Thu Jan 4 21:09:49 2007
@@ -43,6 +43,9 @@
<outputDirectory>qpid-${qpid.version}</outputDirectory>
<includes>
<include>DISCLAIMER</include>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>README.txt</include>
</includes>
</fileSet>
<fileSet>
Modified: incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/src.xml?view=diff&rev=492902&r1=492901&r2=492902
==============================================================================
--- incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/src.xml
(original)
+++ incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/src.xml Thu
Jan 4 21:09:49 2007
@@ -32,10 +32,10 @@
<outputDirectory>qpid-${qpid.version}-src</outputDirectory>
<includes>
<include>DISCLAIMER</include>
- <include>LICENSE</include>
+ <include>LICENSE.txt</include>
<include>licenses/*.*</include>
- <include>NOTICE</include>
- <include>README</include>
+ <include>NOTICE.txt</include>
+ <include>README.txt</include>
<include>BUILDING.txt</include>
</includes>
</fileSet>
