4 files changed, 43 insertions, 13 deletions
diff --git a/qpid/java/build.xml b/qpid/java/build.xml
index 69dcd4d5c0..c704aff43a 100644
--- a/qpid/java/build.xml
+++ b/qpid/java/build.xml
@@ -27,8 +27,10 @@
   <property name="modules.tests"      value="systests perftests integrationtests testkit"/>
   <property name="modules.management" value="management/eclipse-plugin"/>
   <property name="modules.plugin"     value="broker-plugins"/>
-
-  <property name="modules"            value="${modules.core} ${modules.plugin} ${modules.examples} ${modules.tests} ${modules.management}"/>
+  <property name="modules.management.tools" value="management/tools/qpid-cli"/>
+  <property name="modules"            value="${modules.core}
+  ${modules.plugin} ${modules.examples} ${modules.tests}
+  ${modules.management} ${modules.management.tools}"/>
 
   <property name="qpid.jar"           location="${build.lib}/qpid-incubating.jar"/>
   <basename property="qpid.jar.name"  file="${qpid.jar}"/>
diff --git a/qpid/java/management/tools/qpid-cli/bin/qpid-cli b/qpid/java/management/tools/qpid-cli/bin/qpid-cli
index ca1d55c696..304a2c31f8 100755
--- a/qpid/java/management/tools/qpid-cli/bin/qpid-cli
+++ b/qpid/java/management/tools/qpid-cli/bin/qpid-cli
@@ -4,8 +4,8 @@
 # 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
+# tonn you under the Apache License, Version 2.0 (the
+# "Licnense"); 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
@@ -18,7 +18,7 @@
 # under the License.
 #
 # set classpath to using jar files
-for f in $QPID_CLI/lib/*.jar
+for f in $QPID_HOME/lib/*.jar
 do
   CLASSPATH=$CLASSPATH:$f
 done
@@ -26,9 +26,12 @@ export CLASSPATH
 
 
 
-export CLASSPATH=$CLASSPATH:$QPID_CLI/build/main/classes/
-echo $CLASSPATH
+export CLASSPATH=$CLASSPATH:$QPID_HOME/management/tools/qpid-cli/main/classes/
+
 
 
 
 java -classpath $CLASSPATH org.apache.qpid.CommandLineInterpreter $@
+
+
+
diff --git a/qpid/java/management/tools/qpid-cli/bin/qpid-cli.bat b/qpid/java/management/tools/qpid-cli/bin/qpid-cli.bat
index fe83b01184..e282114d75 100755
--- a/qpid/java/management/tools/qpid-cli/bin/qpid-cli.bat
+++ b/qpid/java/management/tools/qpid-cli/bin/qpid-cli.bat
@@ -16,10 +16,10 @@
 @REM specific language governing permissions and limitations
 @REM under the License.
 @REM
-set CLASSPATH=%CLASSPATH%;%QPID_CLI%/lib/jline-0.9.94.jar
-set CLASSPATH=%CLASSPATH%;%QPID_CLI%/lib/junit-4.4.jar
-set CLASSPATH=%CLASSPATH%;%QPID_CLI%/lib/qpid-cli-1.0.jar
-set CLASSPATH=%CLASSPATH%;%QPID_CLI%/build/main/classes/
+set CLASSPATH=%CLASSPATH%;%QPID_HOME%/lib/jline-0.9.94.jar
+set CLASSPATH=%CLASSPATH%;%QPID_HOME%/lib/junit-4.4.jar
+set CLASSPATH=%CLASSPATH%;%QPID_HOME%/lib/qpid-cli-1.0.jar
+set CLASSPATH=%CLASSPATH%;%QPID_HOME%/management/tools/qpid-cli/main/classes/
 java -classpath %CLASSPATH% org.apache.qpid.CommandLineInterpreter %1
 
 
diff --git a/qpid/java/management/tools/qpid-cli/build.xml b/qpid/java/management/tools/qpid-cli/build.xml
index e1dc06b4be..41f0b5101e 100644
--- a/qpid/java/management/tools/qpid-cli/build.xml
+++ b/qpid/java/management/tools/qpid-cli/build.xml
@@ -1,7 +1,28 @@
-<?xml version="1.0" ?>
+<!--
+ -
+ - 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.
+ -
+ -->
 <project name="lahirugsoc2008">
+    <import file="../../../module.xml"/>
+    <property name="module.depends" value="common"/>
     <property name="src.dir" value="src"/>
-    <property name="build.dir" value="build"/>
+    <property name="build.dir" value="${module.build}"/>
     <property name="build.src.dir" value="${build.dir}/main/"/>
     <property name="build.test.dir" value="${build.dir}/test/"/>
     <property name="build.src.classes.dir" value="${build.src.dir}/classes"/>
@@ -22,6 +43,10 @@
         <mkdir dir="${build.src.classes.dir}" />
         <mkdir dir="${build.test.classes.dir}"/>
         <mkdir dir="${jar.dir}"/>
+        <copy file="lib/${dependency1}" todir="${project.root}/lib"/>
+        <copy file="lib/${dependency2}" todir="${project.root}/lib"/>
+        <copy file="bin/qpid-cli" todir="${project.root}/bin"/>
+        <copy file="bin/qpid-cli.bat" todir="${project.root}/bin"/>
     </target>
     <target name="clean">
         <delete dir="${build.src.dir}"/>