From 0b3d5ba2d59301cc0dead3eaf643e2a84cc58e85 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Wed, 18 Jul 2007 15:09:07 +0000
Subject: Ensure the top level release-docs directory is included in the builds

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@557288 13f79535-47bb-0310-9956-ffa450edef68
---
 java/distribution/src/main/assembly/bin-test.xml           |  6 ++++++
 java/distribution/src/main/assembly/bin.xml                | 14 +++++++++++++-
 .../src/main/assembly/management-eclipse-plugin-unix.xml   |  7 ++++++-
 .../src/main/assembly/management-eclipse-plugin.xml        |  7 +++++++
 java/distribution/src/main/assembly/src.xml                |  6 ++++++
 5 files changed, 38 insertions(+), 2 deletions(-)

(limited to 'java')

diff --git a/java/distribution/src/main/assembly/bin-test.xml b/java/distribution/src/main/assembly/bin-test.xml
index 30d9de11d7..04d83916e4 100644
--- a/java/distribution/src/main/assembly/bin-test.xml
+++ b/java/distribution/src/main/assembly/bin-test.xml
@@ -46,6 +46,12 @@
       <outputDirectory>qpid-${qpid.version}</outputDirectory>
     </fileSet>
 
+    <!-- Include any release information -->
+    <fileSet>
+      <directory>../release-docs</directory>
+      <outputDirectory>qpid-${qpid.version}</outputDirectory>
+    </fileSet>
+
     <!-- Include the classpath jar qpid-incubating.jar -->
     <fileSet>
       <directory>target</directory>
diff --git a/java/distribution/src/main/assembly/bin.xml b/java/distribution/src/main/assembly/bin.xml
index 99701c0a08..3620659e48 100644
--- a/java/distribution/src/main/assembly/bin.xml
+++ b/java/distribution/src/main/assembly/bin.xml
@@ -37,7 +37,7 @@
           <include>NOTICE</include>
           <include>README</include>
       </includes>
-	  <fileMode>0444</fileMode>
+      <fileMode>0444</fileMode>
     </fileSet>
 
     <!-- Include any release information -->
@@ -46,6 +46,18 @@
       <outputDirectory>qpid-${qpid.version}</outputDirectory>
     </fileSet>
 
+    <!-- Include any release information -->
+    <fileSet>
+      <directory>..//release-docs</directory>
+      <outputDirectory>qpid-${qpid.version}</outputDirectory>
+    </fileSet>
+
+    <!-- Include any release information -->
+    <fileSet>
+      <directory>../release-docs</directory>
+      <outputDirectory>qpid-${qpid.version}</outputDirectory>
+    </fileSet>
+
     <!-- Include the classpath jar qpid-incubating.jar -->
     <fileSet>
       <directory>target</directory>
diff --git a/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml b/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml
index d5470ef161..02ede019e5 100644
--- a/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml
+++ b/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml
@@ -53,7 +53,6 @@
       <fileMode>0444</fileMode>
     </fileSet>
 
-
     <fileSet>
       <directory>..</directory>
       <outputDirectory>qpidmc</outputDirectory>
@@ -67,6 +66,12 @@
       <outputDirectory>qpidmc</outputDirectory>
     </fileSet>
 
+    <!-- Include any release information -->
+    <fileSet>
+      <directory>../release-docs</directory>
+      <outputDirectory>qpidmc</outputDirectory>
+    </fileSet>
+
     <fileSet>
       <directory>../management/eclipse-plugin/src/main/resources/unix/configuration</directory>
       <outputDirectory>qpidmc/configuration</outputDirectory>
diff --git a/java/distribution/src/main/assembly/management-eclipse-plugin.xml b/java/distribution/src/main/assembly/management-eclipse-plugin.xml
index b260e6b0f2..bd0d2bdd99 100644
--- a/java/distribution/src/main/assembly/management-eclipse-plugin.xml
+++ b/java/distribution/src/main/assembly/management-eclipse-plugin.xml
@@ -45,6 +45,13 @@
       <outputDirectory>qpidmc</outputDirectory>
     </fileSet>
 
+    <!-- Include any release information -->
+    <fileSet>
+      <directory>../release-docs</directory>
+      <outputDirectory>qpidmc</outputDirectory>
+    </fileSet>
+
+
     <fileSet>
       <directory>..</directory>
       <outputDirectory>qpidmc</outputDirectory>
diff --git a/java/distribution/src/main/assembly/src.xml b/java/distribution/src/main/assembly/src.xml
index 2ee80023ef..efdc4d98f4 100644
--- a/java/distribution/src/main/assembly/src.xml
+++ b/java/distribution/src/main/assembly/src.xml
@@ -43,6 +43,12 @@
       <outputDirectory>qpid-${qpid.version}-src</outputDirectory>
     </fileSet>
 
+    <!-- Include any release information -->
+    <fileSet>
+      <directory>../release-docs</directory>
+      <outputDirectory>qpid-${qpid.version}-src</outputDirectory>
+    </fileSet>
+
     <fileSet>
       <directory>..</directory>
       <outputDirectory>qpid-${qpid.version}-src/java</outputDirectory>
-- 
cgit v1.2.1