From 3f1fd31e882601aa3b2568297c78e164ae1744e8 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Fri, 10 Nov 2006 14:21:37 +0000
Subject: QPID-74 Resolved some issues where a few new files were not added

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473345 13f79535-47bb-0310-9956-ffa450edef68
---
 java/build.xml  | 54 ++++++++++++++++++++++++++++++++++++++++++------------
 java/common.xml |  9 ++++++---
 java/module.xml |  6 +++---
 3 files changed, 51 insertions(+), 18 deletions(-)

(limited to 'java')

diff --git a/java/build.xml b/java/build.xml
index e469e02362..90a02520a0 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -105,23 +105,56 @@
   <target name="archive" depends="zip,gzip,bzip2"
           description="produce all archive formats of the distribution tree"/>
 
-    <target name="preparerelease">        
+    <target name="preparerelease">
         <mkdir dir="${release.dir}"/>
     </target>
 
+    <target name="copymodule">
+        <copy todir="${build.release.prepare}/src/java">
+            <fileset dir="${project.root}">
+                <!-- Module src -->
+                <include name="${module}/${bin.dir}/**"/>
+                <include name="${module}/${src.dir}/**"/>
+                <include name="${module}/${lib.dir}/**"/>
+                <include name="${module}/${etc.dir}/**"/>
+                <include name="${module}/${test.dir}/**"/>
+                <include name="${module}/${module.build.file}"/>
+            </fileset>
+        </copy>
+    </target>
+
     <target name="preparereleasesrc" depends="preparerelease">
 
         <!-- Copy Source to prepare directory -->
         <mkdir dir="${build.release.prepare}/src/java"/>
+
+        <antcall target="copymodule">
+            <param name="module" value="broker"/>
+        </antcall>
+
+        <antcall target="copymodule">
+            <param name="module" value="client"/>
+        </antcall>
+
+        <antcall target="copymodule">
+            <param name="module" value="common"/>
+        </antcall>
+
+        <antcall target="copymodule">
+            <param name="module" value="cluster"/>
+        </antcall>
+
+         <copy todir="${build.release.prepare}/src/java">
+            <fileset dir="${project.root}">
+                <include name="management/**"/>
+                <include name="${tasks.dir}/${src.dir}/**"/>
+                <include name="${doc.dir}/**"/>
+            </fileset>
+         </copy>
+
         <copy todir="${build.release.prepare}/src/java">
-            <fileset dir="">
+            <fileset dir="${project.root}">
                 <!-- Module src -->
-                <include name="**/${bin.dir}/**"/>
-                <include name="**/${src.dir}/**"/>
-                <include name="**/${lib.dir}/**"/>
-                <include name="**/${etc.dir}/**"/>
-                <include name="**/${module.build.file}"/>
-
                 <!-- Extra Common files -->
                 <include name="${common.dir}/${stylesheets.dir}/**"/>
                 <include name="${common.dir}/${resources.dir}/**"/>
@@ -132,9 +165,6 @@
                 <include name="${module.file}"/>
                 <include name="${build.properties.file}"/>
 
-                <!-- Exclude Generated content -->
-                <exclude name="**/${build.dir}/**"/>
-                <exclude name="**/${release.dir}/**"/>
             </fileset>
         </copy>
 
@@ -147,7 +177,7 @@
 
         <antcall target="copyreleasedocs">
             <param name="todir" value="${build.release.prepare}"/>
-        </antcall>    
+        </antcall>
 
     </target>
 
diff --git a/java/common.xml b/java/common.xml
index 84dd2e1c97..2b6cc82016 100644
--- a/java/common.xml
+++ b/java/common.xml
@@ -36,10 +36,13 @@
   <property name="bin.dir" value="bin"/>
   <property name="etc.dir" value="etc"/>
   <property name="log.dir" value="log"/>
+  <property name="test.dir" value="test"/>
+  <property name="tasks.dir" value="tasks"/>
   <property name="metainf.dir" value="META-INF"/>
   <property name="release.dir" value="release"/>
   <property name="resources.dir" value="resources"/>
   <property name="stylesheets.dir" value="stylesheets"/>
+  <property name="releasedocs.dir" value="release-docs"/>
   <property name="src.bin" value="${bin.dir}"/>
   <property name="launcher.sfx" value="-launch.jar"/>
 
@@ -78,9 +81,9 @@
   <property name="java.target" value="1.5"/>
   <property name="java.source" value="1.5"/>
 
-  <property name="tasks.dir" value="${project.root}/tasks"/>
-  <property name="tasks.classes" value="${tasks.dir}/classes"/>
-  <property name="tasks.src" value="${tasks.dir}/src"/>
+  <property name="tasks.root.dir" value="${project.root}/tasks"/>
+  <property name="tasks.classes" value="${tasks.root.dir}/classes"/>
+  <property name="tasks.src" value="${tasks.root.dir}/src"/>
   <property name="common.dir" value="common"/>
   <property name="common.root.dir" value="${project.root}/${common.dir}"/>
 
diff --git a/java/module.xml b/java/module.xml
index 844c6987dd..081c5e7c2d 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -96,7 +96,7 @@
     </pathconvert>
 
     <map property="module.manifest.deps" value="${module.depends.dirs}">
-        <globmapper from="*" to="${prefix}*${suffix}${launcher.sfx}"/>        
+        <globmapper from="*" to="*${launcher.sfx}"/>
     </map>
 
     <property name="module.manifest.classpath"
@@ -159,8 +159,8 @@
         <mkdir dir="${destdir}/${bin.dir}"/>
         <copy todir="${destdir}/${bin.dir}" failonerror="false">
             <fileset dir="${src.bin}"/>
-        </copy>
-        <chmod dir="${destdir}" perm="ugo+rx" includes="**/*"/>
+        </copy>        
+        <chmod dir="${destdir}/${bin.dir}" perm="ugo+rx" includes="**/*"/>
     </target>
 
     <target name="build" depends="compile">
-- 
cgit v1.2.1