diff options
| author | Stephen Vinoski <vinoski@apache.org> | 2007-01-05 05:09:49 +0000 |
|---|---|---|
| committer | Stephen Vinoski <vinoski@apache.org> | 2007-01-05 05:09:49 +0000 |
| commit | 9a667f95a2deeaeb2520240c8bc2ce0b09ba6248 (patch) | |
| tree | ce2c48106a52a654398edc10c1abc75b4928317b | |
| parent | 077caff939a3647e7538c309863a012c92f1c767 (diff) | |
| download | qpid-python-9a667f95a2deeaeb2520240c8bc2ce0b09ba6248.tar.gz | |
moved some distribution files
moved some files around underneath the distribution directory, and changed
some assemblies to pick them up
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@492902 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | java/distribution/src/main/assembly/bin.xml | 11 | ||||
| -rw-r--r-- | java/distribution/src/main/assembly/client-bin.xml | 3 | ||||
| -rw-r--r-- | java/distribution/src/main/assembly/src.xml | 6 | ||||
| -rwxr-xr-x | java/distribution/src/main/release/LICENSE.txt (renamed from java/LICENSE.txt) | 0 | ||||
| -rw-r--r-- | java/distribution/src/main/release/NOTICE.txt (renamed from java/NOTICE.txt) | 0 | ||||
| -rw-r--r-- | java/distribution/src/main/release/README.txt (renamed from java/README.txt) | 0 |
6 files changed, 13 insertions, 7 deletions
diff --git a/java/distribution/src/main/assembly/bin.xml b/java/distribution/src/main/assembly/bin.xml index 9b0a56a744..00ffd86bd0 100644 --- a/java/distribution/src/main/assembly/bin.xml +++ b/java/distribution/src/main/assembly/bin.xml @@ -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> diff --git a/java/distribution/src/main/assembly/client-bin.xml b/java/distribution/src/main/assembly/client-bin.xml index f89b1a39d2..b9e9939c95 100644 --- a/java/distribution/src/main/assembly/client-bin.xml +++ b/java/distribution/src/main/assembly/client-bin.xml @@ -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> diff --git a/java/distribution/src/main/assembly/src.xml b/java/distribution/src/main/assembly/src.xml index b66425c3d2..49e1f8bfb2 100644 --- a/java/distribution/src/main/assembly/src.xml +++ b/java/distribution/src/main/assembly/src.xml @@ -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> diff --git a/java/LICENSE.txt b/java/distribution/src/main/release/LICENSE.txt index 6b0b1270ff..6b0b1270ff 100755 --- a/java/LICENSE.txt +++ b/java/distribution/src/main/release/LICENSE.txt diff --git a/java/NOTICE.txt b/java/distribution/src/main/release/NOTICE.txt index 82d3dbc632..82d3dbc632 100644 --- a/java/NOTICE.txt +++ b/java/distribution/src/main/release/NOTICE.txt diff --git a/java/README.txt b/java/distribution/src/main/release/README.txt index 14706170bc..14706170bc 100644 --- a/java/README.txt +++ b/java/distribution/src/main/release/README.txt |