QPID-1342: fixed qpid-cli build and shell scripts; tests still don't run properly by default since the expect the java broker to be running

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@703262 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 20 insertions, 91 deletions

diff --git a/java/management/tools/qpid-cli/bin/qpid-cli b/java/management/tools/qpid-cli/bin/qpid-cli
index 4f0dbf6096..7f84472ebe 100755
--- a/java/management/tools/qpid-cli/bin/qpid-cli
+++ b/java/management/tools/qpid-cli/bin/qpid-cli
@@ -17,21 +17,19 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-# set classpath to using jar files
-for f in $QPID_HOME/lib/*.jar
-do
-  CLASSPATH=$CLASSPATH:$f
-done
-export CLASSPATH
 
+if [ -z "$QPID_HOME" ]; then
+    export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
+    export PATH=${PATH}:${QPID_HOME}/bin
+fi
 
+# Set classpath to include Qpid jar with all required jars in manifest
+QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar
 
-export CLASSPATH=$CLASSPATH:$QPID_HOME/management/tools/qpid-cli/main/classes/
-
-
-
-
-java -classpath $CLASSPATH org.apache.qpid.CommandLineInterpreter $@
-
-
+# Set other variables used by the qpid-run script before calling
+export JAVA=java \
+       JAVA_VM=-server \
+       JAVA_MEM=-Xmx1024m \
+       QPID_CLASSPATH=$QPID_LIBS
 
+. qpid-run org.apache.qpid.CommandLineInterpreter "$@"
diff --git a/java/management/tools/qpid-cli/build.xml b/java/management/tools/qpid-cli/build.xml
index 41f0b5101e..4b0aaec2ad 100644
--- a/java/management/tools/qpid-cli/build.xml
+++ b/java/management/tools/qpid-cli/build.xml
@@ -18,81 +18,13 @@
  - 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="${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"/>
-    <property name="build.test.classes.dir" value="${build.test.dir}/classes"/>
-    <property name="jar.dir" value="${build.dir}/jar"/>
-    <property name="lib.dir" value="lib"/>
-    <property name="test.dir" value="test"/>
-    <property name="dependency1" value="jline-0.9.94.jar"/>
-    <property name="dependency2" value="junit-4.4.jar"/>
-    <property name="project.name" value="qpid-cli"/>
-    <property name="project.version" value="1.0"/>
-    <property name="target.name" value="${project.name}-${project.version}.jar"/>
-    <property name="target.jar" location="${jar.dir}/${target.name}"/>
-    <property name="build.failed" location="${build.test.dir}/results/FAILED"/>
-    <property name="test.suite" value="org.apache.qpid.AllTest"/>
-    <property name="test.report.dir" value="${build.test.dir}/reports"/>
-    <target name="init">
-        <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}"/>
-        <delete dir="${build.test.dir}"/>
-        <delete dir="${jar.dir}"/>
-    </target>
-    <target name="compile" depends="init">
-        <javac srcdir="${src.dir}"
-               destdir="${build.src.classes.dir}">
-            <classpath>
-                <pathelement path="${lib.dir}/${dependency1}"/>
-            </classpath>
-        </javac>
-    </target>
-    <target name="compile-tests" depends="compile">
-        <javac srcdir="${test.dir}"
-               destdir="${build.test.classes.dir}"
-               debug="true"
-               includeAntRuntime="true">
-            <classpath>
-                <pathelement path="${lib.dir}/${dependency2}"/>
-                <pathelement path="${build.src.classes.dir}"/>
-            </classpath>
-        </javac>
-    </target>
-    <target name="jar" depends="compile">
-        <jar destfile="${target.jar}" duplicate="preserve"
-             compress="true">
-            <fileset dir="${build.src.classes.dir}"/>
-        </jar>
-    </target>
-    <target name="test" depends="compile-tests">
-        <junit printsummary="true">
-            <classpath>
-                <pathelement path="${build.test.classes.dir}"/>
-                <pathelement path="${build.src.classes.dir}"/>
-                <pathelement path="${lib.dir}/${dependency2}"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-            <test name="${test.suite}"/>
-        </junit>
-    </target>
-</project>
-
-
-
+<project name="qpid-cli">
 
+  <property name="module.depends" value="common" />
+  <property name="module.test.depends" value="common client" />
+  <property name="module.src" value="src" />
+  <property name="module.test.src" value="test" />
 
+  <import file="../../../module.xml"/>
 
+</project>
diff --git a/java/management/tools/qpid-cli/lib/jline-0.9.94.jar b/java/management/tools/qpid-cli/lib/jline-0.9.94.jar
deleted file mode 100644
index dafca7c46e..0000000000
--- a/java/management/tools/qpid-cli/lib/jline-0.9.94.jar
+++ /dev/null
diff --git a/java/management/tools/qpid-cli/lib/junit-4.4.jar b/java/management/tools/qpid-cli/lib/junit-4.4.jar
deleted file mode 100644
index 649b0b327f..0000000000
--- a/java/management/tools/qpid-cli/lib/junit-4.4.jar
+++ /dev/null
diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/ConnectorFactory.java b/java/management/tools/qpid-cli/src/org/apache/qpid/ConnectorFactory.java
index 6c0bacf3ac..a94003dc45 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/ConnectorFactory.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/ConnectorFactory.java
@@ -64,8 +64,7 @@ public class ConnectorFactory {
             mbsc = jmxc.getMBeanServerConnection();
 
         } catch (IOException e) {
-            e.printStackTrace();
-            return null; //To change body of catch statement use File | Settings | File Templates.
+            throw new RuntimeException(e);
         }
         return new Connector(url, jmxc, mbsc);
     }