QPID-1748, QPID-1752, QPID-1753 : Updated module.xml added qpid.java.root to be reference the java dir so that sub projects such as m

anagement/client and management/tools/qpid-cli and correctly point to the top level lib dir which is not always simply ${basedir}/..
This allowed the easy creation of Client Example package(build.deps was updated for this to include log4j as a dependency so the resulting package will run) QMan/WSDL pacakge and the qpid-cli management tool


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@773431 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 37 insertions, 8 deletions

diff --git a/qpid/java/build.deps b/qpid/java/build.deps
index 6bb9bfa09e..3232cc8a85 100644
--- a/qpid/java/build.deps
+++ b/qpid/java/build.deps
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
 backport-util-concurrent=lib/backport-util-concurrent-2.2.jar
 
 commons-beanutils-core=lib/commons-beanutils-core-1.8.0.jar
@@ -92,7 +110,7 @@ systests.libs=${client.libs} ${test.libs} ${broker.libs}
 perftests.libs=${systests.libs}
 integrationtests.libs=${systests.libs}
 
-client-example.libs=${client.libs}
+client-example.libs=${client.libs} ${slf4j-log4j} ${log4j}
 testkit.libs=${client.libs}
 
 ibm-icu=lib/com.ibm.icu_3.8.1.v20080530.jar
@@ -154,13 +172,12 @@ management-eclipse-plugin.platform-libs=${ecl-equinox-launcher-win32-win32-x86}
 
 management-eclipse-plugin.libs=${management-eclipse-plugin.core-libs} ${management-eclipse-plugin.platform-libs}
     
-
 management-tools-qpid-cli.libs=${common.libs} ${jline}
 
 common.test.libs=${test.libs}
 broker.test.libs=${test.libs}
 client.test.libs=${broker.libs} ${test.libs}
-client-example.test.libs=${test.libs}
+client-example.test.libs=${test.libs} 
 tools.test.libs=${client.test.libs}
 testkit.test.libs=${test.libs}
 management-client.test.libs=${muse.libs} ${test.libs} ${log4j} ${javassist} ${geronimo-servlet} ${commons-pool}
diff --git a/qpid/java/client/example/build.xml b/qpid/java/client/example/build.xml
index 8bcd59d829..58a4fd44d2 100644
--- a/qpid/java/client/example/build.xml
+++ b/qpid/java/client/example/build.xml
@@ -21,7 +21,11 @@
 <project name="AMQ Client" default="build">
 
   <property name="module.depends" value="common client"/>
+   
+  <property name="qpid.java.root" value="..${file.separator}.." />
 
   <import file="../../module.xml"/>
 
+  <target name="release-bin" depends="release-bin-tasks"/>
+
 </project>
diff --git a/qpid/java/management/client/build.xml b/qpid/java/management/client/build.xml
index 729c15e2a6..aea815b766 100644
--- a/qpid/java/management/client/build.xml
+++ b/qpid/java/management/client/build.xml
@@ -37,6 +37,8 @@
 		<mkdir dir="${module.release}${file.separator}examples${file.separator}sample_messages"/>
 	
 	</target>
+
+	<target name="release-bin" depends="release-bin-tasks"/>
 	
 	<target name="resources-release" description="copy resources into module release">
 		<copy todir="${module.release}" failonerror="false" flatten="true">
diff --git a/qpid/java/management/tools/qpid-cli/build.xml b/qpid/java/management/tools/qpid-cli/build.xml
index 7026cd2fd2..f943c7f7e0 100644
--- a/qpid/java/management/tools/qpid-cli/build.xml
+++ b/qpid/java/management/tools/qpid-cli/build.xml
@@ -20,12 +20,17 @@
  -->
 <project name="qpid-cli">
 
-  <property name="module.depends" value="common management/common" />
+  <property name="module.depends" value="common management-common" />
   <property name="module.test.depends" value="common client" />
   <property name="module.src" value="src" />
   <!-- Disable tests as per QPID-1342 -->
   <!--property name="module.test.src" value="test" /-->
+  
+  <property name="qpid.java.root" value="..${file.separator}..${file.separator}.." />
+
 
   <import file="../../../module.xml"/>
 
+  <target name="release-bin" depends="release-bin-tasks"/>
+
 </project>
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 4a613b32f8..f656a6432c 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -32,10 +32,11 @@
     </filtermapper>
   </map>	
 	
-  <echo message="Running ant for module : ${module}" level="info"/>
+  <echo message="Running ant for module : ${module.name}" level="info"/>
 
   <property file="${project.root}/build.deps"/>
-
+  
+  <property name="qpid.java.root"      location=".."/>
   <property name="module.build"        location="${build}/${module}"/>
   <property name="module.classes"      location="${module.build}/classes"/>
   <property name="module.instrumented" location="${module.build}/classes-instrumented"/>
@@ -342,7 +343,7 @@
   <target name="libs-release" description="copy dependencies into module release">
     <!-- Copy the module dependencies -->
     <copy todir="${module.release}" failonerror="true">
-      <fileset dir="${basedir}${file.separator}.." includes="${module.libs}"/>
+      <fileset dir="${basedir}${file.separator}${qpid.java.root}" includes="${module.libs}"/>
     </copy>
     <!-- Copy the jar for this module -->
     <copy todir="${module.release}/lib" failonerror="true">
@@ -353,7 +354,7 @@
 
   <target name="resources" description="copy resources into build tree">
     <copy todir="${build}" failonerror="false" flatten="true">
-      <fileset dir="${basedir}${file.separator}.." includes="${resources}"/>
+      <fileset dir="${basedir}${qpid.java.root}" includes="${resources}"/>
     </copy>
   </target>