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@492902 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 13 insertions, 7 deletions

diff --git a/qpid/java/distribution/src/main/assembly/bin.xml b/qpid/java/distribution/src/main/assembly/bin.xml
index 9b0a56a744..00ffd86bd0 100644
--- a/qpid/java/distribution/src/main/assembly/bin.xml
+++ b/qpid/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/qpid/java/distribution/src/main/assembly/client-bin.xml b/qpid/java/distribution/src/main/assembly/client-bin.xml
index f89b1a39d2..b9e9939c95 100644
--- a/qpid/java/distribution/src/main/assembly/client-bin.xml
+++ b/qpid/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/qpid/java/distribution/src/main/assembly/src.xml b/qpid/java/distribution/src/main/assembly/src.xml
index b66425c3d2..49e1f8bfb2 100644
--- a/qpid/java/distribution/src/main/assembly/src.xml
+++ b/qpid/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/qpid/java/LICENSE.txt b/qpid/java/distribution/src/main/release/LICENSE.txt
index 6b0b1270ff..6b0b1270ff 100755
--- a/qpid/java/LICENSE.txt
+++ b/qpid/java/distribution/src/main/release/LICENSE.txt
diff --git a/qpid/java/NOTICE.txt b/qpid/java/distribution/src/main/release/NOTICE.txt
index 82d3dbc632..82d3dbc632 100644
--- a/qpid/java/NOTICE.txt
+++ b/qpid/java/distribution/src/main/release/NOTICE.txt
diff --git a/qpid/java/README.txt b/qpid/java/distribution/src/main/release/README.txt
index 14706170bc..14706170bc 100644
--- a/qpid/java/README.txt
+++ b/qpid/java/distribution/src/main/release/README.txt