QPID-3260: remove defunct java/management/tools/qpid-cli module

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

29 files changed, 0 insertions, 4253 deletions

diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java
deleted file mode 100644
index eadc87186f..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Command.java
+++ /dev/null
@@ -1,33 +0,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.
- *
- */
-package org.apache.qpid;
-
-public interface Command
-{
-    public void execute();
-
-    public void printusage();
-
-    public String optionchecker(String string);
-
-    public boolean checkoptionsetting(String string);
-
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecutionEngine.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecutionEngine.java
deleted file mode 100644
index 69f261b4ba..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandExecutionEngine.java
+++ /dev/null
@@ -1,76 +0,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.
- *
- */
-package org.apache.qpid;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.qpid.utils.JMXinfo;
-
-public class CommandExecutionEngine
-{
-    private static Map<String, Class<? extends Command>> _commands = new HashMap<String, Class<? extends Command>>();
-    private Command currentcommand = null;
-    private String commandname = null;
-    private JMXinfo info = null;
-
-    public CommandExecutionEngine(JMXinfo info)
-    {
-        this.info = info;
-        this.commandname = info.getCommandLineOptionParser().getcommandname();
-    }
-
-    public boolean CommandSelector() throws Exception
-    {
-        Class<? extends Command> commandClass = _commands.get(this.commandname);
-        if (commandClass != null)
-        {
-            Class<?> parameterTypes = JMXinfo.class;
-            currentcommand = (Command) commandClass.getConstructor(parameterTypes).newInstance(info);
-        }
-        else
-        {
-            usage();
-            return false;
-        }
-        return true;
-    }
-
-    public static void addCommand(String name, Class<? extends Command> newCommand)
-    {
-        _commands.put(name, newCommand);
-    }
-    
-    public static Map<String, Class<? extends Command>> getCommands()
-    {
-        return _commands;
-    }
-
-    public void runcommand()
-    {
-        currentcommand.execute();
-    }
-
-    public void usage()
-    {
-        System.out.println(commandname + ":Command not found");
-    }
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java
deleted file mode 100644
index d8e76172bc..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/CommandLineInterpreter.java
+++ /dev/null
@@ -1,263 +0,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.
- *
- */
-
-package org.apache.qpid;
-
-import java.io.PrintWriter;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import javax.management.MBeanServerConnection;
-import javax.management.remote.JMXConnector;
-
-import jline.ArgumentCompletor;
-import jline.ConsoleReader;
-import jline.SimpleCompletor;
-
-import org.apache.qpid.commands.Commanddelete;
-import org.apache.qpid.commands.Commandget;
-import org.apache.qpid.commands.Commandhelp;
-import org.apache.qpid.commands.Commandinfo;
-import org.apache.qpid.commands.Commandlist;
-import org.apache.qpid.commands.Commandmove;
-import org.apache.qpid.commands.Commandset;
-import org.apache.qpid.commands.Commandview;
-import org.apache.qpid.commands.Commandviewcontent;
-import org.apache.qpid.utils.CommandLineOptionParser;
-import org.apache.qpid.utils.JMXConfiguration;
-import org.apache.qpid.utils.JMXinfo;
-
-public class CommandLineInterpreter
-{
-    private static final String OBJECT_VIRTUALHOST = "virtualhost";
-    private static final String OBJECT_USERMANAGEMENT = "usermanagement";
-    private static final String OBJECT_CONNECTION = "connection";
-    private static final String OBJECT_EXCHANGE = "exchange";
-    private static final String OBJECT_QUEUE = "queue";
-    private static final String COMMAND_QUIT = "quit";
-    private static final String COMMAND_EXIT = "exit";
-
-    public static void main(String[] args)
-    {
-        Connector conn = null;
-        try
-        {
-            // Create an RMI connector client and
-            // connect it to the RMI connector server
-
-            /*
-             * checking the commandline options and parse them in to config
-             * method
-             */
-            JMXConnector jmxc = null;
-            MBeanServerConnection mbsc = null;
-            ConsoleReader reader = new ConsoleReader();
-            reader.setBellEnabled(false);
-            CommandLineOptionParser commandlineoptionparser = null;
-
-            if ((args == null) || (args.length) == 0)
-            {
-                Usage();
-            }
-            /*
-             * here special constructor is calling, when parsing options,in here
-             * first option value is starting from minus sign so this is handle
-             * by a special constructor
-             */
-            else
-            {
-                if (args[0].startsWith("-"))
-                {
-                    commandlineoptionparser = new CommandLineOptionParser(args, args[0]); // if
-                                                                                          // user
-                                                                                          // specify
-                                                                                          // any
-                                                                                          // argument
-                                                                                          // with
-                                                                                          // the
-                                                                                          // qpid-cli
-                                                                                          // script
-                }
-            }
-
-            registerCommands();
-
-            /* Connecting with the broker */
-            try
-            {
-                if (commandlineoptionparser == null)
-                    commandlineoptionparser = new CommandLineOptionParser(args);
-
-                JMXConfiguration config = new JMXConfiguration(commandlineoptionparser.getAlloptions());
-                conn = ConnectorFactory.getConnector(config.gethostname(), config.getport(), config.getUsername(),
-                        config.getPassword());
-                jmxc = conn.getConnector();
-                mbsc = conn.getMBeanServerConnection();
-                if (config.checkoptionsetting("r", commandlineoptionparser.getAlloptions()))
-                {
-                    JMXinfo info = new JMXinfo(jmxc, commandlineoptionparser, mbsc);
-                    ReportGenerator reportgen = new ReportGenerator(config.optionchecker("r", commandlineoptionparser
-                            .getAlloptions()), info);
-                    reportgen.loadproperties();
-                    reportgen.run();
-                }
-                /*
-                 * This implementation is for the people who are using the
-                 * interactive mode for one shot this run the user given command
-                 * and exit
-                 */
-                for (int i = 0; i < args.length; i++)
-                {
-                    if (CommandExecutionEngine.getCommands().keySet().contains(args[i]))
-                    {
-                        oneshotmode(args, commandlineoptionparser, jmxc, mbsc);
-                        return;
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                connectionrefuse(ex);
-                return;
-            }
-            /* In this point connection has been established */
-            String line;
-            String[] command;
-
-            /* prividing GNU readline features using Jline library */
-            PrintWriter out = new PrintWriter(System.out);
-            SimpleCompletor completer = new SimpleCompletor(new String[] { 
-                    COMMAND_EXIT, COMMAND_QUIT, OBJECT_QUEUE, OBJECT_EXCHANGE, OBJECT_CONNECTION,
-                    OBJECT_USERMANAGEMENT, OBJECT_VIRTUALHOST});
-            for (String commandName : CommandExecutionEngine.getCommands().keySet())
-            {
-                completer.addCandidateString(commandName);
-            }
-            reader.addCompletor(new ArgumentCompletor(completer));
-            while ((line = reader.readLine("qpid-admin-$ ")) != null)
-            {
-                out.flush();
-                if (removeSpaces(line).equalsIgnoreCase(COMMAND_QUIT) || removeSpaces(line).equalsIgnoreCase(COMMAND_EXIT))
-                    break;
-                else if (line.length() == 0)
-                    continue;
-                else
-                {
-                    command = line.split("\\s+");
-                    commandlineoptionparser = new CommandLineOptionParser(command);
-                    JMXinfo info = new JMXinfo(jmxc, commandlineoptionparser, mbsc);
-                    CommandExecutionEngine engine = new CommandExecutionEngine(info);
-                    if (engine.CommandSelector())
-                        engine.runcommand();
-                }
-            }
-
-            conn.getConnector().close();
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-    }
-
-    private static void registerCommands()
-    {
-        CommandExecutionEngine.addCommand(Commanddelete.COMMAND_NAME, Commanddelete.class);
-        CommandExecutionEngine.addCommand(Commandget.COMMAND_NAME, Commandget.class);
-        CommandExecutionEngine.addCommand(Commandhelp.COMMAND_NAME, Commandhelp.class);
-        CommandExecutionEngine.addCommand(Commandinfo.COMMAND_NAME, Commandinfo.class);
-        CommandExecutionEngine.addCommand(Commandlist.COMMAND_NAME, Commandlist.class);
-        CommandExecutionEngine.addCommand(Commandmove.COMMAND_NAME, Commandmove.class);
-        CommandExecutionEngine.addCommand(Commandset.COMMAND_NAME, Commandset.class);
-        CommandExecutionEngine.addCommand(Commandview.COMMAND_NAME, Commandview.class);
-        CommandExecutionEngine.addCommand(Commandviewcontent.COMMAND_NAME, Commandviewcontent.class);
-    }
-
-    private static void Usage()
-    {
-        System.out.println("Connecting to localhost Qpid java broker...");
-    }
-
-    private static String removeSpaces(String s)
-    {
-        StringTokenizer st = new StringTokenizer(s, " ", false);
-        String t = "";
-        while (st.hasMoreElements())
-            t += st.nextElement();
-        return t;
-    }
-
-    private static void connectionrefuse(Exception e)
-    {
-        String message = e.getLocalizedMessage();
-        if (e instanceof SecurityException)
-        {
-            message = " authentication failed, please check username and password";
-        }
-        else
-        {
-            Throwable cause = e.getCause();
-            while (cause != null)
-            {
-                message = cause.getMessage();
-                cause = cause.getCause();
-            }
-        }
-
-        System.out.println("Cannot connect with the broker: " + message);
-    }
-
-    public static String[] oneshotmode(String[] args, CommandLineOptionParser commandlineoptionparser,
-            JMXConnector jmxc, MBeanServerConnection mbsc) throws Exception
-    {
-        int check = 0;
-        String[] temp;
-        for (int i = 0; i < args.length; i++)
-        {
-
-            if (args[i].compareTo("-h") == 0)
-                check++;
-            else if (args[i].compareTo("-p") == 0)
-                check++;
-        }
-        for (int i = 0; i < (args.length - 2 * check); i++)
-        { // mulitply by 2 because have to remove the option letter with the
-          // option value//
-            args[i] = args[i + check * 2];
-        }
-
-        commandlineoptionparser = new CommandLineOptionParser(args); // change
-                                                                     // the args
-                                                                     // string
-                                                                     // array
-                                                                     // which
-                                                                     // works as
-                                                                     // interactive
-                                                                     // mode//
-        JMXinfo info = new JMXinfo(jmxc, commandlineoptionparser, mbsc);
-        CommandExecutionEngine engine = new CommandExecutionEngine(info);
-        if (engine.CommandSelector())
-            engine.runcommand();
-        return args;
-
-    }
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Connector.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Connector.java
deleted file mode 100644
index 2b887077c3..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/Connector.java
+++ /dev/null
@@ -1,49 +0,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.
- *
- */
-package org.apache.qpid;
-
-import javax.management.MBeanServerConnection;
-import javax.management.remote.JMXConnector;
-
-public class Connector
-{
-    private JMXConnector jmxc = null;
-    private MBeanServerConnection mbsc = null;
-
-    public Connector(JMXConnector jmxc, MBeanServerConnection mbsc)
-    {
-
-        this.jmxc = jmxc;
-        this.mbsc = mbsc;
-
-    }
-
-    public JMXConnector getConnector()
-    {
-        return jmxc;
-    }
-
-    public MBeanServerConnection getMBeanServerConnection()
-    {
-        return mbsc;
-    }
-
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/ConnectorFactory.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/ConnectorFactory.java
deleted file mode 100644
index 84ba94c5c4..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/ConnectorFactory.java
+++ /dev/null
@@ -1,50 +0,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.
- *
- */
-package org.apache.qpid;
-
-import javax.management.MBeanServerConnection;
-import javax.management.remote.JMXConnector;
-
-import org.apache.qpid.management.common.JMXConnnectionFactory;
-
-public class ConnectorFactory
-{
-
-    private static final long TIMEOUT = 30 * 1000;
-
-    public static Connector getConnector(String host, String port, String username, String password) throws Exception
-    {
-
-        JMXConnector jmxc = null;
-        MBeanServerConnection mbsc = null;
-        try
-        {
-            jmxc = JMXConnnectionFactory.getJMXConnection(TIMEOUT, host, Integer.parseInt(port), username, password);
-            mbsc = jmxc.getMBeanServerConnection();
-        }
-        catch (NumberFormatException e)
-        {
-            System.out.println("Illegal port entered:" + port);
-            System.exit(1);
-        }
-        return new Connector(jmxc, mbsc);
-    }
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/ReportGenerator.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/ReportGenerator.java
deleted file mode 100644
index 9d14f78b42..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/ReportGenerator.java
+++ /dev/null
@@ -1,195 +0,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.
- *
- */
-package org.apache.qpid;
-
-import org.apache.qpid.commands.objects.*;
-import org.apache.qpid.utils.JMXinfo;
-
-import javax.management.MBeanServerConnection;
-import java.util.*;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-public class ReportGenerator implements Runnable
-{
-
-    String[] propertyname = { "object", "column", "filter.name", "filter.virtualhost", "output", "seperator",
-            "interval" };
-    String[] propertyvalue = null;
-    String propertyfilepath = null;
-    String[] columnvalue = null;
-    List<String> columns = null;
-    Properties props = null;
-    JMXinfo info = null;
-    int interval = 10;
-
-    public void run()
-    {
-        for (;;) // creating infinite loop
-        {
-            generatereport();
-            try
-            {
-                Thread.sleep((long)this.interval * 60000L);
-            }
-            catch (Exception ex)
-            {
-                ex.printStackTrace();
-            }
-        }
-    }
-
-    public ReportGenerator(String propfile, JMXinfo info)
-    {
-        this.propertyfilepath = propfile;
-        props = new Properties();
-        propertyvalue = new String[propertyname.length];
-        this.info = info;
-        columns = new ArrayList<String>();
-    }
-
-    public void loadproperties() // get all the property file values and set the
-                                 // columen values//
-    {
-        try
-        {
-
-            props.load(new FileInputStream(this.propertyfilepath));
-            for (int i = 0; i < propertyname.length; i++)
-            {
-                propertyvalue[i] = props.getProperty(propertyname[i]);
-            }
-            this.setcolumnvalues();
-            this.setinterval();
-        }
-
-        // catch exception in case properties file does not exist
-
-        catch (IOException e)
-        {
-            System.out.println("Oooops Give property file is not exist");
-        }
-    }
-
-    public void generatereport()
-    {
-        this.listobjects(propertyvalue[0]);
-    }
-
-    private void setcolumnvalues()
-    {
-        columnvalue = propertyvalue[1].split(",");
-        for (int i = 0; i < columnvalue.length; i++)
-        {
-            columns.add(columnvalue[i]);
-        }
-    }
-
-    private void setinterval()
-    {
-        this.interval = (new Integer(propertyvalue[6])).intValue();
-    }
-
-    private void listobjects(String option_value)
-    {
-        /*
-         * pring usage if use is not give the correct option letter or no
-         * options
-         */
-        if (option_value == null)
-        {
-            // System.out.println("testing");
-            return;
-        }
-        MBeanServerConnection mbsc = info.getmbserverconnector();
-        Set set = null;
-        ObjectNames objname = null;
-
-        try
-        {
-            if (option_value.compareToIgnoreCase("queue") == 0 || option_value.compareToIgnoreCase("queues") == 0)
-            {
-                objname = new QueueObject(mbsc);
-
-            }
-            else if (option_value.compareToIgnoreCase("Virtualhosts") == 0
-                    || option_value.compareToIgnoreCase("Virtualhost") == 0)
-            {
-                objname = new VirtualHostObject(mbsc);
-                // this.name = option_value;
-            }
-            else if (option_value.compareToIgnoreCase("Exchange") == 0
-                    || option_value.compareToIgnoreCase("Exchanges") == 0)
-            {
-                objname = new ExchangeObject(mbsc);
-                // this.name = option_value;
-            }
-            else if (option_value.compareToIgnoreCase("Connection") == 0
-                    || option_value.compareToIgnoreCase("Connections") == 0)
-            {
-                objname = new ConnectionObject(mbsc);
-                // this.name = option_value;
-            }
-            else if (option_value.compareToIgnoreCase("all") == 0)
-            {
-                objname = new AllObjects(mbsc);
-                // this.name = option_value;
-            }
-            else if (option_value.compareToIgnoreCase("Usermanagement") == 0
-                    || option_value.compareToIgnoreCase("Usermanagmenets") == 0)
-            {
-                objname = new UserManagementObject(mbsc);
-                // this.name = option_value;
-            }
-            else
-            {
-                printusage();
-                echo("Wrong objectName");
-                return;
-            }
-            objname.setQueryString(this.propertyvalue[0], this.propertyvalue[2], this.propertyvalue[3]);
-            objname.returnObjects();
-            if (objname.getSet().size() != 0)
-            {
-                objname.reportgenerator(this.propertyvalue[4], this.propertyvalue[5], columns);
-            }
-            else
-            {
-                printusage();
-            }
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-
-    }
-
-    public void echo(String str)
-    {
-        System.out.println(str);
-    }
-
-    public void printusage()
-    {
-        System.out.println("Wrong option or wrong option value");
-    }
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
deleted file mode 100644
index 6fdae4c0a6..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/CommandImpl.java
+++ /dev/null
@@ -1,153 +0,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.
- *
- */
-
-package org.apache.qpid.commands;
-
-import java.util.Map;
-
-import org.apache.qpid.Command;
-import org.apache.qpid.utils.CommandLineOption;
-import org.apache.qpid.utils.JMXinfo;
-
-public abstract class CommandImpl implements Command
-{
-    protected JMXinfo info = null;
-
-    private String name;
-    private String virtualhost = null;
-    private String object = null;
-
-    private String outputformat = null;
-    private String seperator = ",";
-
-    public CommandImpl(JMXinfo info)
-    {
-        this.info = info;
-    }
-
-    public CommandImpl()
-    {
-
-    }
-
-    protected void setName(String name)
-    {
-        this.name = name;
-    }
-
-    public String getName()
-    {
-        return this.name;
-    }
-
-    protected boolean hasName()
-    {
-        if (this.name == null)
-            return false;
-
-        else
-            return true;
-    }
-
-    protected void setObject(String object)
-    {
-        this.object = object;
-    }
-
-    public String getObject()
-    {
-        return this.object;
-    }
-
-    protected void setOutputFormat(String outputformat)
-    {
-        this.outputformat = outputformat;
-    }
-
-    protected String getOutputFormat()
-    {
-        return outputformat;
-    }
-
-    protected void setSeperator(String seperator)
-    {
-        this.seperator = seperator;
-    }
-
-    protected String getSeperator()
-    {
-        return seperator;
-    }
-
-    protected void setVirtualhost(String virtualhost)
-    {
-        this.virtualhost = virtualhost;
-    }
-
-    public String getVirtualhost()
-    {
-        return this.virtualhost;
-    }
-
-    public String optionchecker(String option_letter)
-    {
-        Map map = info.getCommandLineOptionParser().getAlloptions();
-        if (map == null)
-            return null;
-        CommandLineOption option = (CommandLineOption) map.get(option_letter);
-        if (option == null)
-            return null;
-        String value = option.getOptionValue();
-        return value;
-    }
-
-    public boolean checkoptionsetting(String option_letter)
-    {
-        Map map = info.getCommandLineOptionParser().getAlloptions();
-        if (map == null)
-            return false;
-        CommandLineOption option = (CommandLineOption) map.get(option_letter);
-        if (option == null)
-            return false;
-        String value = option.getOptionType();
-
-        if (value != null)
-            return true;
-        else
-            return false;
-    }
-
-    public void echo(String str)
-    {
-        System.out.println(str);
-    }
-
-    public void unrecognizeoption()
-    {
-        echo("list: Unrecognized option");
-        echo("Try --help for more information");
-    }
-
-    public abstract void execute();
-
-    public abstract void printusage();
-
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commanddelete.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commanddelete.java
deleted file mode 100644
index cdbb8f1d4f..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commanddelete.java
+++ /dev/null
@@ -1,199 +0,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.
- *
- */
-
-package org.apache.qpid.commands;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-import org.apache.qpid.commands.objects.QueueObject;
-import org.apache.qpid.utils.JMXinfo;
-
-public class Commanddelete extends CommandImpl
-{
-    private int number = 0;
-    private QueueObject objname;
-    private MBeanServerConnection mbsc;
-    private String method1, method2;
-    private ObjectName queue;
-    public static final String COMMAND_NAME = "delete";
-
-    public Commanddelete(JMXinfo info)
-    {
-        super(info);
-        this.mbsc = info.getmbserverconnector();
-        this.objname = new QueueObject(mbsc);
-        this.method1 = "deleteMessageFromTop";
-        this.method2 = "clearQueue";
-
-    }
-
-    public void deletemessages()
-    {
-        Set set = null;
-        objname.setQueryString(this.getObject(), this.getName(), this.getVirtualhost());
-        set = objname.returnObjects();
-
-        if (objname.getSet().size() != 0)
-        {
-            Iterator it = set.iterator();
-            this.queue = (ObjectName) it.next();
-            try
-            {
-                if (this.number == 0)
-                {
-                    echo("");
-                    System.out.print("Do you want to delete all the messages from the Queue [Y/N] :");
-                    InputStreamReader isr = new InputStreamReader(System.in);
-                    BufferedReader br = new BufferedReader(isr);
-                    String s = br.readLine();
-                    echo(s);
-                    if (s.compareToIgnoreCase("y") == 0)
-                        this.mbsc.invoke(queue, this.method2, null, null);
-                    else
-                        return;
-                }
-                else if (objname.getmessagecount(this.queue) < this.number)
-                {
-                    echo("Given number is Greater than the Queue Depth");
-                    return;
-                }
-                else
-                {
-                    for (int i = 0; i < this.number; i++)
-                    {
-                        this.mbsc.invoke(queue, this.method1, null, null);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                ex.printStackTrace();
-            }
-
-        }
-        else
-        {
-            if (hasName())
-            {
-
-                echo("The Queue you have specified is not in the current broker");
-                echo("");
-            }
-            else
-            {
-                printusage();
-            }
-        }
-    }
-
-    public void execute()
-    {
-        /*
-         * In here you it's easy to handle any number of otpions which are going
-         * to add with the list command which works with main option object or o
-         */
-
-        if (checkoptionsetting("object") || checkoptionsetting("o"))
-        {
-            String object = optionchecker("object");
-            if (object == null)
-            {
-                object = optionchecker("o");
-            }
-            if (object.compareToIgnoreCase("queue") == 0)
-                setObject(object);
-            else
-            {
-                unrecognizeoption();
-                echo("This command is only applicable for delete command so please start with queue");
-            }
-            if (checkoptionsetting("name") || checkoptionsetting("n"))
-            {
-                String name = optionchecker("name");
-                if (name == null)
-                    name = optionchecker("n");
-
-                setName(name);
-            }
-            if (checkoptionsetting("virtualhost") || checkoptionsetting("v"))
-            {
-                String vhost = optionchecker("virtualhost");
-                if (vhost == null)
-                    vhost = optionchecker("v");
-                setVirtualhost(vhost);
-            }
-            if (checkoptionsetting("top") || checkoptionsetting("t"))
-            {
-                String number = optionchecker("top");
-                if (number == null)
-                    number = optionchecker("t");
-
-                setnumber(removeSpaces(number));
-            }
-            this.deletemessages();
-        }
-        else if (checkoptionsetting("h") || checkoptionsetting("help"))
-            printusage();
-        else
-            unrecognizeoption();
-    }
-
-    public void printusage()
-    {
-        echo("");
-        echo("Usage:delete [OPTION] ... [OBJECT TYPE]...\n");
-        echo("Delete the top most messages from the given queue object\n");
-        echo("To specify the desired queue you have to give the virtualhost name and the queue name with following commands\n");
-        echo("Where possible options include:\n");
-        echo("        -v      --virtualhost Give the virtuallhost name of the desired queue");
-        echo("        -n      --name        Give the queue name of the desired queue you want to do the delete operation");
-        echo("        -t      --top         Give how many number of messages you want to delete from the top (Default = all the messages will be deleted");
-        echo("        -h      --help        Display the help and back to the qpid-cli prompt\n");
-
-    }
-
-    private void setnumber(String number)
-    {
-        Integer i = new Integer(number);
-        this.number = i.intValue();
-    }
-
-    public int getnumber()
-    {
-        return this.number;
-    }
-
-    private static String removeSpaces(String s)
-    {
-        StringTokenizer st = new StringTokenizer(s, " ", false);
-        String t = "";
-        while (st.hasMoreElements())
-            t += st.nextElement();
-        return t;
-    }
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java
deleted file mode 100644
index cb67edeb34..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java
+++ /dev/null
@@ -1,211 +0,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.
- *
- */
-
-package org.apache.qpid.commands;
-
-import org.apache.qpid.commands.objects.ObjectNames;
-import org.apache.qpid.commands.objects.QueueObject;
-import org.apache.qpid.utils.JMXinfo;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import java.util.Set;
-
-public class Commandget extends CommandImpl
-{
-
-    private String _attributeName;
-    private String _value;
-    public static final String COMMAND_NAME = "get";
-
-    public Commandget(JMXinfo info)
-    {
-        super(info);
-    }
-
-    private void getAttribute(String option_value)
-    {
-        if (option_value == null)
-        {
-            printusage();
-            return;
-        }
-        MBeanServerConnection mbsc = info.getmbserverconnector();
-        Set set = null;
-        ObjectNames objname = null;
-
-        try
-        {
-            if (option_value.compareToIgnoreCase("queue") == 0 || option_value.compareToIgnoreCase("queues") == 0)
-            {
-                objname = new QueueObject(mbsc);
-            }
-            else
-            {
-                printusage();
-                echo("Wrong objectName");
-                return;
-            }
-
-            if (_attributeName == null)
-            {
-                echo("attribute name not specified. See --help for details");
-                return;
-            }
-
-            objname.setQueryString(this.getObject(), this.getName(), this.getVirtualhost());
-            objname.returnObjects();
-
-            if (objname.getSet().size() != 1)
-            {
-                echo("Your query returned more than one object to set was this intended?\n" + objname.getQueryString());
-            }
-            else if (objname.getSet().size() == 1)
-            {
-                ObjectName object = (ObjectName) objname.getSet().iterator().next();
-
-                Object value = objname.getAttribute(object, _attributeName);
-
-                echo(value.toString());
-            }
-            else
-            {
-                if (hasName())
-                {
-
-                    echo("You might be querying wrong " + this.getObject() + " name with --name or -n option ");
-                    echo("");
-                    echo("No " + this.getObject() + "Type Objects might not in the broker currently");
-                    echo("");
-                }
-                else
-                {
-                    printusage();
-                }
-            }
-
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-
-    }
-
-    public void execute()
-    {
-        /*
-         * In here you it's easy to handle any number of otpions which are going
-         * to add with the list command which works with main option object or o
-         */
-        if (checkoptionsetting("output"))
-        {
-            setOutputFormat(optionchecker("output"));
-            if (checkoptionsetting("separator"))
-            {
-                setSeperator(optionchecker("separator"));
-            }
-        }
-        if (checkoptionsetting("object") || checkoptionsetting("o"))
-        {
-            String object = optionchecker("object");
-            if (object == null)
-            {
-                object = optionchecker("o");
-            }
-            setObject(object);
-
-            if (checkoptionsetting("name") || checkoptionsetting("n"))
-            {
-                String name = optionchecker("name");
-                if (name == null)
-                {
-                    name = optionchecker("n");
-                }
-
-                setName(name);
-            }
-
-            if (checkoptionsetting("attribute") || checkoptionsetting("a"))
-            {
-                String name = optionchecker("attribute");
-                if (name == null)
-                {
-                    name = optionchecker("a");
-                }
-
-                setAttributeName(name);
-            }
-            if (checkoptionsetting("virtualhost") || checkoptionsetting("v"))
-            {
-                String vhost = optionchecker("virtualhost");
-                if (vhost == null)
-                {
-                    vhost = optionchecker("v");
-                }
-                setVirtualhost(vhost);
-            }
-            getAttribute(this.getObject());
-        }
-        else if (checkoptionsetting("h") || checkoptionsetting("help"))
-        {
-            printusage();
-        }
-        else
-        {
-            unrecognizeoption();
-        }
-    }
-
-    private void setAttributeName(String name)
-    {
-        this._attributeName = name;
-    }
-
-    public void printusage()
-    {
-        echo("");
-        echo("Usage:set [OPTION] ... [OBJECT TYPE]...\n");
-        echo("List the information about the given object\n");
-        echo("Where possible options include:\n");
-        echo("        -o      --object      type of objects which you want to list\n");
-        echo("                              ex: < list -o queue > : lists all the queues created in the java broker\n");
-        echo("                              For now list command is supporting following object typse \n");
-        echo("                              Queue  Connection  VirtualHost  UserMangement  Exchange");
-        echo("                              Or You can specify object type by giving it at the beginning");
-        echo("                              rather giving it as a argument");
-        echo("                              Ex:< queue list > this command is equal to list -o queue \n");
-        echo("        -v      --virtualhost After specifying the object type you can filter output with this option");
-        echo("                              list objects with the given virtualhost which will help to find ");
-        echo("                              identical queue objects with -n option");
-        echo("                              ex: queue list -v develop   ment");
-        echo("        -n      --name        After specifying what type of objects you want to monitor you can filter");
-        echo("                              the output using -n option by specifying the name of the object you want ");
-        echo("                              to monitor exactly");
-        echo("                              ex: <list -o queue -n ping> : list all the queue objects having queue name");
-        echo("                              of ping");
-        echo("                              ex: <queue list -n ping -v development> list all the queue objects with name ");
-        echo("                              of ping and virtualhost of developement \n");
-        echo("        -a      --attribute   ");
-        echo("        -h      --help        Display the help and back to the qpid-cli prompt\n");
-
-    }
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandhelp.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandhelp.java
deleted file mode 100644
index 502ac89f74..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandhelp.java
+++ /dev/null
@@ -1,56 +0,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.
- *
- */
-
-package org.apache.qpid.commands;
-
-import org.apache.qpid.utils.JMXinfo;
-
-public class Commandhelp extends CommandImpl
-{
-
-    public static final String COMMAND_NAME = "help";
-
-    public Commandhelp(JMXinfo info)
-    {
-    }
-
-    public void execute()
-    {
-        printusage();
-    }
-
-    public void printusage()
-    {
-        echo("");
-        echo("Current version of qpid CLI is supporting following commands");
-        echo("");
-        echo("[list]    This command is listing limited information about a given type of object");
-        echo("          For more information about list command run `list --help`");
-        echo("[info]    This command is listing All the information about a given type of object");
-        echo("          For more information about list command run `info --help`");
-
-        echo("");
-        echo("[exit]    This command is disconnect the connection with the Qpid Java broker and go back to normal propmt");
-        echo("[quit]    This command is disconnect the connection with the Qpid Java broker and go back to normal propmt");
-        echo("");
-    }
-
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java
deleted file mode 100644
index 7094a8fc7f..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandinfo.java
+++ /dev/null
@@ -1,206 +0,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.
- *
- */
-
-package org.apache.qpid.commands;
-
-import java.util.Set;
-
-import javax.management.MBeanServerConnection;
-
-import org.apache.qpid.commands.objects.AllObjects;
-import org.apache.qpid.commands.objects.ConnectionObject;
-import org.apache.qpid.commands.objects.ExchangeObject;
-import org.apache.qpid.commands.objects.ObjectNames;
-import org.apache.qpid.commands.objects.QueueObject;
-import org.apache.qpid.commands.objects.UserManagementObject;
-import org.apache.qpid.commands.objects.VirtualHostObject;
-import org.apache.qpid.utils.JMXinfo;
-
-public class Commandinfo extends CommandImpl
-{
-
-    public static final String COMMAND_NAME = "info";
-
-    public Commandinfo(JMXinfo info)
-    {
-        super(info);
-    }
-
-    private void listobjects(String option_value)
-    {
-        /*
-         * pring usage if use is not give the correct option letter or no
-         * options
-         */
-        if (option_value == null)
-        {
-            // System.out.println("testing");
-            printusage();
-            return;
-        }
-        MBeanServerConnection mbsc = info.getmbserverconnector();
-        Set set = null;
-        ObjectNames objname = null;
-
-        try
-        {
-            if (option_value.compareToIgnoreCase("queue") == 0 || option_value.compareToIgnoreCase("queues") == 0)
-            {
-                objname = new QueueObject(mbsc);
-
-            }
-            else if (option_value.compareToIgnoreCase("Virtualhosts") == 0
-                    || option_value.compareToIgnoreCase("Virtualhost") == 0)
-            {
-                objname = new VirtualHostObject(mbsc);
-                // this.name = option_value;
-            }
-            else if (option_value.compareToIgnoreCase("Exchange") == 0
-                    || option_value.compareToIgnoreCase("Exchanges") == 0)
-            {
-                objname = new ExchangeObject(mbsc);
-                // this.name = option_value;
-            }
-            else if (option_value.compareToIgnoreCase("Connection") == 0
-                    || option_value.compareToIgnoreCase("Connections") == 0)
-            {
-                objname = new ConnectionObject(mbsc);
-                // this.name = option_value;
-            }
-            else if (option_value.compareToIgnoreCase("all") == 0)
-            {
-                objname = new AllObjects(mbsc);
-                // this.name = option_value;
-            }
-            else if (option_value.compareToIgnoreCase("Usermanagement") == 0
-                    || option_value.compareToIgnoreCase("Usermanagmenets") == 0)
-            {
-                objname = new UserManagementObject(mbsc);
-                // this.name = option_value;
-            }
-            else
-            {
-                printusage();
-                echo("Wrong objectName");
-                return;
-            }
-            objname.setQueryString(this.getObject(), this.getName(), this.getVirtualhost());
-            objname.returnObjects();
-            if (objname.getSet().size() != 0)
-            {
-                objname.displayinfo(this.getOutputFormat(), this.getSeperator());
-
-            }
-            else
-            {
-                if (hasName())
-                {
-
-                    echo("You might querying wrong " + this.getObject() + " name with --name or -n option ");
-                    echo("");
-                    echo("No "+this.getObject() + "Type Objects might not be in the broker currently");
-                    echo("");
-                }
-                else
-                {
-                    printusage();
-                }
-            }
-
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-
-    }
-
-    public void execute()
-    {
-        /*
-         * In here you it's easy to handle any number of otpions which are going
-         * to add with the list command which works with main option object or o
-         */
-        if (checkoptionsetting("output"))
-        {
-            setOutputFormat(optionchecker("output"));
-            if (checkoptionsetting("separator"))
-                setSeperator(optionchecker("separator"));
-        }
-        if (checkoptionsetting("object") || checkoptionsetting("o"))
-        {
-            String object = optionchecker("object");
-            if (object == null)
-            {
-                object = optionchecker("o");
-            }
-            setObject(object);
-            if (checkoptionsetting("name") || checkoptionsetting("n"))
-            {
-                String name = optionchecker("name");
-                if (name == null)
-                    name = optionchecker("n");
-
-                setName(name);
-            }
-            if (checkoptionsetting("virtualhost") || checkoptionsetting("v"))
-            {
-                String vhost = optionchecker("virtualhost");
-                if (vhost == null)
-                    vhost = optionchecker("v");
-                setVirtualhost(vhost);
-            }
-            listobjects(this.getObject());
-        }
-        else if (checkoptionsetting("h") || checkoptionsetting("help"))
-            printusage();
-        else
-            unrecognizeoption();
-    }
-
-    public void printusage()
-    {
-        echo("");
-        echo("Usage:info [OPTION] ... [OBJECT TYPE]...\n");
-        echo("Give ALL the information about the given object\n");
-        echo("Where possible options include:\n");
-        echo("        -o      --object      type of objects which you want to list\n");
-        echo("                              ex: < list -o queue > : lists all the queues created in the java broker\n");
-        echo("                              For now list command is supporting following object typse \n");
-        echo("                              Queue  Connection  VirtualHost  UserMangement  Exchange");
-        echo("                              Or You can specify object type by giving it at the beginning rather giving ");
-        echo("                              it as a argument");
-        echo("                              Ex:< queue info > this command is equal to <info -o queue> command \n");
-        echo("        -v      --virtualhost After specifying the object type you can filter output with this option");
-        echo("                              list objects with the given virtualhost which will help to find identical");
-        echo("                              queue objects with -n option");
-        echo("                              ex: queue info -v developement");
-        echo("        -output               Specify which output format you want to get the ouput");
-        echo("                              Although the option is there current version supports only for CSV output format");
-        echo("        -separator            This option use with output option to specify which separator you want to get the CSV output (default seperator is comma");
-        echo("        -h      --help        Display the help and back to the qpid-cli prompt\n");
-        echo("        -n      --name        After specifying what type of objects you want to monitor you can filter");
-        echo("                              the output using -n option by specifying the name of the object you want");
-        echo("                              to monitor exactly");
-        echo("                              ex: <queue info -n ping> : Give all the information about queue objects ");
-        echo("                              having queue name of ping\n");
-    }
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandlist.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandlist.java
deleted file mode 100644
index 68ee593ba0..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandlist.java
+++ /dev/null
@@ -1,232 +0,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.
- *
- */
-
-package org.apache.qpid.commands;
-
-import java.util.Set;
-
-import javax.management.MBeanServerConnection;
-
-import org.apache.qpid.commands.objects.AllObjects;
-import org.apache.qpid.commands.objects.ConnectionObject;
-import org.apache.qpid.commands.objects.ExchangeObject;
-import org.apache.qpid.commands.objects.ObjectNames;
-import org.apache.qpid.commands.objects.QueueObject;
-import org.apache.qpid.commands.objects.UserManagementObject;
-import org.apache.qpid.commands.objects.VirtualHostObject;
-import org.apache.qpid.utils.JMXinfo;
-
-public class Commandlist extends CommandImpl
-{
-
-    public static final String COMMAND_NAME = "list";
-
-    public Commandlist(JMXinfo info)
-    {
-        super(info);
-    }
-
-    private void listobjects(String option_value)
-    {
-        /*
-         * pring usage if use is not give the correct option letter or no
-         * options
-         */
-        if (option_value == null)
-        {
-            // System.out.println("testing");
-            printusage();
-            return;
-        }
-        MBeanServerConnection mbsc = info.getmbserverconnector();
-        Set set = null;
-        ObjectNames objname = null;
-
-        try
-        {
-            if (option_value.compareToIgnoreCase("queue") == 0 || option_value.compareToIgnoreCase("queues") == 0)
-            {
-                objname = new QueueObject(mbsc);
-
-            }
-            else if (option_value.compareToIgnoreCase("Virtualhosts") == 0
-                    || option_value.compareToIgnoreCase("Virtualhost") == 0)
-            {
-                objname = new VirtualHostObject(mbsc);
-                // this.name = option_value;
-            }
-            else if (option_value.compareToIgnoreCase("Exchange") == 0
-                    || option_value.compareToIgnoreCase("Exchanges") == 0)
-            {
-                objname = new ExchangeObject(mbsc);
-                // this.name = option_value;
-            }
-            else if (option_value.compareToIgnoreCase("Connection") == 0
-                    || option_value.compareToIgnoreCase("Connections") == 0)
-            {
-                objname = new ConnectionObject(mbsc);
-                // this.name = option_value;
-            }
-            else if (option_value.compareToIgnoreCase("all") == 0)
-            {
-                objname = new AllObjects(mbsc);
-                // this.name = option_value;
-            }
-            else if (option_value.compareToIgnoreCase("Usermanagement") == 0
-                    || option_value.compareToIgnoreCase("Usermanagmenets") == 0)
-            {
-                objname = new UserManagementObject(mbsc);
-                // this.name = option_value;
-            }
-            else
-            {
-                printusage();
-                echo("Wrong objectName");
-                return;
-            }
-            objname.setQueryString(this.getObject(), this.getName(), this.getVirtualhost());
-            objname.returnObjects();
-            if (objname.getSet().size() != 0)
-            {
-                if (this.getObject().compareToIgnoreCase("queue") == 0
-                        || this.getObject().compareToIgnoreCase("queues") == 0)
-                    objname.displayqueues(this.getOutputFormat(), this.getSeperator());
-                else
-                    objname.displayobjects(this.getOutputFormat(), this.getSeperator());
-            }
-            else
-            {
-                if (hasName())
-                {
-
-                    echo("You might quering wrong " + this.getObject() + " name with --name or -n option ");
-                    echo("");
-                    echo(this.getObject() + "Type Objects might not in the broker currently");
-                    echo("");
-                }
-                else
-                {
-                    printusage();
-                }
-            }
-
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-
-    }
-
-    public void listdomains()
-    {
-        MBeanServerConnection mbsc = info.getmbserverconnector();
-        try
-        {
-            String[] domains = mbsc.getDomains();
-            echo("DOMAINS");
-            for (int i = 0; i < domains.length; i++)
-                echo("\tDomain[" + i + "] = " + domains[i]);
-
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-    }
-
-    public void execute()
-    {
-        /*
-         * In here you it's easy to handle any number of otpions which are going
-         * to add with the list command which works with main option object or o
-         */
-        if (checkoptionsetting("output"))
-        {
-            setOutputFormat(optionchecker("output"));
-            if (checkoptionsetting("separator"))
-                setSeperator(optionchecker("separator"));
-        }
-        if (checkoptionsetting("object") || checkoptionsetting("o"))
-        {
-            String object = optionchecker("object");
-            if (object == null)
-            {
-                object = optionchecker("o");
-            }
-            setObject(object);
-            if (checkoptionsetting("name") || checkoptionsetting("n"))
-            {
-                String name = optionchecker("name");
-                if (name == null)
-                    name = optionchecker("n");
-
-                setName(name);
-            }
-            if (checkoptionsetting("virtualhost") || checkoptionsetting("v"))
-            {
-                String vhost = optionchecker("virtualhost");
-                if (vhost == null)
-                    vhost = optionchecker("v");
-                setVirtualhost(vhost);
-            }
-            listobjects(this.getObject());
-        }
-        else if (checkoptionsetting("domain") || checkoptionsetting("d"))
-            listdomains();
-        else if (checkoptionsetting("h") || checkoptionsetting("help"))
-            printusage();
-        else
-            unrecognizeoption();
-    }
-
-    public void printusage()
-    {
-        echo("");
-        echo("Usage:list [OPTION] ... [OBJECT TYPE]...\n");
-        echo("List the information about the given object\n");
-        echo("Where possible options include:\n");
-        echo("        -o      --object      type of objects which you want to list\n");
-        echo("                              ex: < list -o queue > : lists all the queues created in the java broker\n");
-        echo("                              For now list command is supporting following object typse \n");
-        echo("                              Queue  Connection  VirtualHost  UserMangement  Exchange");
-        echo("                              Or You can specify object type by giving it at the beginning");
-        echo("                              rather giving it as a argument");
-        echo("                              Ex:< queue list > this command is equal to list -o queue \n");
-        echo("        -d      --domain      list all the domains of objects available for remote monitoring\n");
-        echo("        -v      --virtualhost After specifying the object type you can filter output with this option");
-        echo("                              list objects with the given virtualhost which will help to find ");
-        echo("                              identical queue objects with -n option");
-        echo("                              ex: queue list -v develop   ment");
-        echo("        -output               Specify which output format you want to get the ouput");
-        echo("                              Although the option is there current version supports only for CSV output format");
-        echo("        -separator            This option use with output option to specify which separator you want to get the CSV output (default seperator is comma");
-        echo("        -h      --help        Display the help and back to the qpid-cli prompt\n");
-        echo("        -n      --name        After specifying what type of objects you want to monitor you can filter");
-        echo("                              the output using -n option by specifying the name of the object you want ");
-        echo("                              to monitor exactly");
-        echo("                              ex: <list -o queue -n ping> : list all the queue objects having queue name");
-        echo("                              of ping");
-        echo("                              ex: <queue list -n ping -v development> list all the queue objects with name ");
-        echo("                              of ping and virtualhost of developement \n");
-
-    }
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandmove.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandmove.java
deleted file mode 100644
index 6d1803409b..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandmove.java
+++ /dev/null
@@ -1,259 +0,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.
- *
- */
-
-package org.apache.qpid.commands;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-import org.apache.qpid.commands.objects.QueueObject;
-import org.apache.qpid.utils.JMXinfo;
-
-public class Commandmove extends CommandImpl
-{
-
-    public static final String COMMAND_NAME = "move";
-
-    private String name1 = null, name2 = null, vhost1 = null, vhost2 = null, method1 = null, method2 = null; // target
-                                                                                                             // and
-                                                                                                             // starting
-                                                                                                             // queue
-                                                                                                             // specifications
-                                                                                                             // happen
-                                                                                                             // with
-                                                                                                             // these
-                                                                                                             // options
-    private QueueObject queue1;
-    private MBeanServerConnection mbsc;
-    private ObjectName queue;
-    private int fmid = 0, tmid = 0;
-
-    public Commandmove(JMXinfo info)
-    {
-        super(info);
-
-        this.mbsc = info.getmbserverconnector();
-        this.queue1 = new QueueObject(mbsc);
-        this.method1 = "moveMessages";
-        this.method2 = "getMessagesOnTheQueue";
-
-    }
-
-    public void movemessages()
-    {
-        Set set = null;
-        queue1.setQueryString(this.getObject(), this.name1, this.vhost1);
-        set = queue1.returnObjects();
-        if (queue1.getSet().size() != 0)
-        { // find the queue
-            Iterator it = set.iterator();
-            this.queue = (ObjectName) it.next();
-        }
-        else
-        {
-            if (isname1() || isname2())
-            { // if the specified queue is not there in the broker
-
-                echo("The Queue you have specified is not in the current broker");
-                echo("");
-            }
-            else
-            {
-                printusage();
-            }
-        }
-        try
-        {
-            Object[] params1 = { getfmid(), gettmid(), this.name2 };
-            String[] signature1 = { new String("long"), new String("long"), new String("java.lang.String") };
-            this.mbsc.invoke(this.queue, this.method1, params1, signature1);
-
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-            echo("Given messageId's might be wrong please run the view command and check messageId's you have given\n");
-            echo("From MessageId should be greater than 0 and should less than To messageId");
-        }
-
-    }
-
-    public void execute()
-    {
-        /*
-         * In here you it's easy to handle any number of otpions which are going
-         * to add with the list command which works with main option object or o
-         */
-
-        if (checkoptionsetting("object") || checkoptionsetting("o"))
-        {
-            String object = optionchecker("object");
-            if (object == null)
-            {
-                object = optionchecker("o");
-            }
-            if (object.compareToIgnoreCase("queue") == 0)
-                setObject(object);
-            else
-            {
-                unrecognizeoption();
-                echo("This command is only applicable for queue command so please start with queue");
-            }
-            if (checkoptionsetting("n2") && checkoptionsetting("n1"))
-            {
-                setname1(optionchecker("n1"));
-                setname2(optionchecker("n2"));
-            }
-            else
-            {
-                echo("You have to specify both n1 and n2 option value to move a message"); /*
-                                                                                            * when
-                                                                                            * user
-                                                                                            * forget
-                                                                                            * to
-                                                                                            * specify
-                                                                                            * target
-                                                                                            * or
-                                                                                            * starting
-                                                                                            * queue
-                                                                                            * name
-                                                                                            */
-                return;
-            }
-
-            if (checkoptionsetting("v1"))
-            {
-
-                setvhost1(optionchecker("v1"));
-            }
-            if (checkoptionsetting("tmid") && checkoptionsetting("fmid"))
-            {
-                String tmid = optionchecker("tmid");
-                String fmid = optionchecker("fmid");
-
-                settomessageIdandfrommessageId(removeSpaces(tmid), removeSpaces(fmid));
-            }
-            else
-            {
-                echo("You have to set from MessageId and to MessageId in order to move messages between queues");
-                echo("To view MessageId's use <view> command with -n and -v options");
-                return;
-            }
-            this.movemessages();
-
-        }
-        else if (checkoptionsetting("h") || checkoptionsetting("help"))
-            printusage();
-        else
-            unrecognizeoption();
-    }
-
-    public void printusage()
-    {
-        echo("");
-        echo("Usage:move [OPTION] ... [OBJECT TYPE]...\n");
-        echo("Move the top most messages from the given queue object to the given destination object\n");
-        echo("To specify the desired queues you have to give the virtualhost name and the queue name with following commands\n");
-        echo("Where possible options include:\n");
-        echo("        -v1                   Give the virtuallhost name from which queue you want to move messages");
-        echo("        -n1                   Give the queue name which you want to move messages from");
-        echo("        -n2                   Give the queue name of the destination queue");
-        echo("        -tmid                 Give From MessageId you want to move from the Queue");
-        echo("        -fmid                 Give To MessageId you want to move from the Queue");
-        echo("        -h      --help        Display the help and back to the qpid-cli prompt\n");
-
-    }
-
-    private void setname1(String name)
-    {
-        this.name1 = name;
-    }
-
-    private void setname2(String name)
-    {
-        this.name2 = name;
-    }
-
-    private boolean isname1()
-    {
-        if (this.name1 == null)
-            return false;
-
-        else
-            return true;
-    }
-
-    private boolean isname2()
-    {
-        if (this.name2 == null)
-            return false;
-
-        else
-            return true;
-    }
-
-    private void setvhost1(String vhost)
-    {
-        this.vhost1 = vhost;
-    }
-
-    private static String removeSpaces(String s)
-    {
-        StringTokenizer st = new StringTokenizer(s, " ", false);
-        String t = "";
-        while (st.hasMoreElements())
-            t += st.nextElement();
-        return t;
-    }
-
-    private void settomessageIdandfrommessageId(String tmid, String fmid)
-    {
-        Integer i = new Integer(tmid);
-        Integer j = new Integer(fmid);
-        this.tmid = i.intValue();
-        this.fmid = j.intValue();
-    }
-
-    public int gettmid()
-    {
-        return this.tmid;
-    }
-
-    public int getfmid()
-    {
-        return this.fmid;
-    }
-
-    public String getname1()
-    {
-        return this.name1;
-    }
-
-    public String getname2()
-    {
-        return this.name2;
-    }
-
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java
deleted file mode 100644
index e70b7b17ad..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java
+++ /dev/null
@@ -1,260 +0,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.
- *
- */
-
-package org.apache.qpid.commands;
-
-import org.apache.qpid.commands.objects.ObjectNames;
-import org.apache.qpid.commands.objects.QueueObject;
-import org.apache.qpid.utils.JMXinfo;
-
-import javax.management.Attribute;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import java.util.Set;
-
-public class Commandset extends CommandImpl
-{
-    private String _attributeName;
-    private String _value;
-    public static final String COMMAND_NAME = "set";
-
-    public Commandset(JMXinfo info)
-    {
-        super(info);
-    }
-
-    private void setAttribute(String option_value)
-    {
-        /*
-         * print usage if use is not give the correct option letter or no
-         * options
-         */
-        if (option_value == null)
-        {
-            printusage();
-            return;
-        }
-        MBeanServerConnection mbsc = info.getmbserverconnector();
-        Set set = null;
-        ObjectNames objname = null;
-
-        try
-        {
-            if (option_value.compareToIgnoreCase("queue") == 0 || option_value.compareToIgnoreCase("queues") == 0)
-            {
-                objname = new QueueObject(mbsc);
-            }
-            else
-            {
-                printusage();
-                echo("Wrong objectName");
-                return;
-            }
-
-            if (_attributeName == null)
-            {
-                echo("attribute name not specified. See --help for details");
-                return;
-            }
-
-            if (_value == null)
-            {
-                echo("new value not specified. See --help for details");
-                return;
-            }
-
-            objname.setQueryString(this.getObject(), this.getName(), this.getVirtualhost());
-            objname.returnObjects();
-
-            if (objname.getSet().size() != 1)
-            {
-                echo("Your query returned more than one object to set was this intended?" + objname.getQueryString());
-            }
-            else if (objname.getSet().size() == 1)
-            {
-                ObjectName object = (ObjectName) objname.getSet().iterator().next();
-
-                Object value = objname.getAttribute(object, _attributeName);
-
-                Object attributeValue = _value;
-
-                try
-                {
-                    if (value instanceof Integer)
-                    {
-                        attributeValue = Integer.valueOf(_value);
-                    }
-                    else if (value instanceof Long)
-                    {
-                        attributeValue = Long.valueOf(_value);
-                    }
-                }
-                catch (NumberFormatException nfe)
-                {
-                    echo("Value(" + _attributeName + ") should be of type " + value.getClass().getName());
-                    return;
-                }
-
-                Attribute attribute = new Attribute(_attributeName, attributeValue);
-
-                objname.setAttribute(object, attribute);
-            }
-            else
-            {
-                if (hasName())
-                {
-
-                    echo("You might be querying wrong " + this.getObject() + " name with --name or -n option ");
-                    echo("");
-                    echo("No " + this.getObject() + "Type Objects might not in the broker currently");
-                    echo("");
-                }
-                else
-                {
-                    printusage();
-                }
-            }
-
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-
-    }
-
-    public void execute()
-    {
-        /*
-         * In here you it's easy to handle any number of otpions which are going
-         * to add with the list command which works with main option object or o
-         */
-        if (checkoptionsetting("output"))
-        {
-            setOutputFormat(optionchecker("output"));
-            if (checkoptionsetting("separator"))
-            {
-                setSeperator(optionchecker("separator"));
-            }
-        }
-        if (checkoptionsetting("object") || checkoptionsetting("o"))
-        {
-            String object = optionchecker("object");
-            if (object == null)
-            {
-                object = optionchecker("o");
-            }
-            setObject(object);
-
-            if (checkoptionsetting("name") || checkoptionsetting("n"))
-            {
-                String name = optionchecker("name");
-                if (name == null)
-                {
-                    name = optionchecker("n");
-                }
-
-                setName(name);
-            }
-
-            if (checkoptionsetting("attribute") || checkoptionsetting("a"))
-            {
-                String name = optionchecker("attribute");
-                if (name == null)
-                {
-                    name = optionchecker("a");
-                }
-
-                setAttributeName(name);
-            }
-
-            if (checkoptionsetting("set") || checkoptionsetting("s"))
-            {
-                String value = optionchecker("set");
-                if (value == null)
-                {
-                    value = optionchecker("s");
-                }
-
-                setAttributeValue(value);
-            }
-
-            if (checkoptionsetting("virtualhost") || checkoptionsetting("v"))
-            {
-                String vhost = optionchecker("virtualhost");
-                if (vhost == null)
-                {
-                    vhost = optionchecker("v");
-                }
-                setVirtualhost(vhost);
-            }
-            setAttribute(this.getObject());
-        }
-        else if (checkoptionsetting("h") || checkoptionsetting("help"))
-        {
-            printusage();
-        }
-        else
-        {
-            unrecognizeoption();
-        }
-    }
-
-    private void setAttributeValue(String value)
-    {
-        _value = value;
-    }
-
-    private void setAttributeName(String name)
-    {
-        this._attributeName = name;
-    }
-
-    public void printusage()
-    {
-        echo("");
-        echo("Usage:set [OPTION] ... [OBJECT TYPE]...\n");
-        echo("List the information about the given object\n");
-        echo("Where possible options include:\n");
-        echo("        -o      --object      type of objects which you want to list\n");
-        echo("                              ex: < list -o queue > : lists all the queues created in the java broker\n");
-        echo("                              For now list command is supporting following object typse \n");
-        echo("                              Queue  Connection  VirtualHost  UserMangement  Exchange");
-        echo("                              Or You can specify object type by giving it at the beginning");
-        echo("                              rather giving it as a argument");
-        echo("                              Ex:< queue list > this command is equal to list -o queue \n");
-        echo("        -v      --virtualhost After specifying the object type you can filter output with this option");
-        echo("                              list objects with the given virtualhost which will help to find ");
-        echo("                              identical queue objects with -n option");
-        echo("                              ex: queue list -v develop   ment");
-        echo("        -n      --name        After specifying what type of objects you want to monitor you can filter");
-        echo("                              the output using -n option by specifying the name of the object you want ");
-        echo("                              to monitor exactly");
-        echo("                              ex: <list -o queue -n ping> : list all the queue objects having queue name");
-        echo("                              of ping");
-        echo("                              ex: <queue list -n ping -v development> list all the queue objects with name ");
-        echo("                              of ping and virtualhost of developement \n");
-        echo("        -a      --attribute   ");
-        echo("        -h      --help        Display the help and back to the qpid-cli prompt\n");
-
-    }
-
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandview.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandview.java
deleted file mode 100644
index e3bcc7e543..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandview.java
+++ /dev/null
@@ -1,255 +0,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.
- *
- */
-
-package org.apache.qpid.commands;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.TabularDataSupport;
-
-import org.apache.qpid.commands.objects.QueueObject;
-import org.apache.qpid.utils.JMXinfo;
-
-public class Commandview extends CommandImpl
-{
-
-    public static final String COMMAND_NAME = "view";
-
-    private int number = 0;
-    private QueueObject objname;
-    private MBeanServerConnection mbsc;
-    private String method1;
-    private ObjectName queue;
-
-    public Commandview(JMXinfo info)
-    {
-        super(info);
-        this.mbsc = info.getmbserverconnector();
-        this.objname = new QueueObject(mbsc);
-        this.method1 = "viewMessages";
-
-    }
-
-    public void viewmessages()
-    {
-        objname.setQueryString(this.getObject(), this.getName(), this.getVirtualhost());
-        Set set = objname.returnObjects();
-        String header = "", temp_header = "", message_data = "", outline = "";
-
-        if (objname.getSet().size() != 0)
-        {
-            Iterator it = set.iterator();
-            this.queue = (ObjectName) it.next();
-            try
-            {
-                if (objname.getmessagecount(this.queue) == 0)
-                {
-                    echo("Selected Queue doesn't contain any messages");
-                    return;
-                }
-                if (this.number == 0)
-                    this.number = objname.getmessagecount(this.queue);
-
-                if (objname.getmessagecount(this.queue) < this.number)
-                {
-                    echo("Given number is Greater than the Queue Depth");
-                    return;
-                }
-                else
-                {
-                    Object[] params = { 1, this.number };
-                    String[] signature = { new String("int"), new String("int") };
-                    TabularDataSupport data = (TabularDataSupport) this.mbsc.invoke(queue, this.method1, params,
-                            signature);
-
-                    Set entrySet = data.entrySet();
-                    ArrayList<Map.Entry> list = new ArrayList<Map.Entry>(entrySet);
-                    if (list.size() != 0)
-                    {// no data}
-                        for (int i = 0; i < list.size(); i++)
-                        {
-                            CompositeData compositedata = (CompositeData) (list.get(i)).getValue();
-                            List<String> itemNames = new ArrayList<String>(compositedata.getCompositeType().keySet());
-                            if (i == 0) // display the table headers
-                            {
-                                for (int j = 0; j < itemNames.size(); j++)
-                                {
-                                    temp_header = "";
-                                    if (j != 1) // skipping header information
-                                    {
-                                        temp_header = itemNames.get(j);
-                                        while (temp_header.length() < 15)
-                                            temp_header = " " + temp_header;
-
-                                        header = header + temp_header + "|";
-                                    }
-                                    else
-                                        continue;
-                                }
-                                echo(header);
-                                while (outline.length() < header.length())
-                                    outline = outline + "-";
-                                echo(outline);
-                            }
-
-                            for (int j = 0; j < itemNames.size(); j++)
-                            {
-                                temp_header = "";
-                                if (j != 1)
-                                {
-                                    temp_header = String.valueOf(compositedata.get(itemNames.get(j)));
-                                    while (temp_header.length() < 15)
-                                        temp_header = " " + temp_header;
-                                    message_data = message_data + temp_header + "|";
-                                }
-                                else
-                                    // header information is not displaying
-                                    // unless user specify header information is
-                                    // needed
-                                    continue;
-
-                            }
-                            echo(message_data);
-                            header = "";
-                            message_data = "";
-                        }
-                    }
-                    else
-                    {
-                        System.out.println("No Data to Display");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                ex.printStackTrace();
-            }
-
-        }
-        else
-        {
-            if (hasName())
-            {
-
-                echo("The Queue you have specified is not in the current broker");
-                echo("");
-            }
-            else
-            {
-                printusage();
-            }
-        }
-    }
-
-    public void execute()
-    {
-        /*
-         * In here you it's easy to handle any number of otpions which are going
-         * to add with the list command which works with main option object or o
-         */
-
-        if (checkoptionsetting("object") || checkoptionsetting("o"))
-        {
-            String object = optionchecker("object");
-            if (object == null)
-            {
-                object = optionchecker("o");
-            }
-            if (object.compareToIgnoreCase("queue") == 0)
-                setObject(object);
-            else
-            {
-                unrecognizeoption();
-                echo("This command is only applicable for delete command so please start with queue");
-            }
-            if (checkoptionsetting("name") || checkoptionsetting("n"))
-            {
-                String name = optionchecker("name");
-                if (name == null)
-                    name = optionchecker("n");
-
-                setName(name);
-            }
-            if (checkoptionsetting("virtualhost") || checkoptionsetting("v"))
-            {
-                String vhost = optionchecker("virtualhost");
-                if (vhost == null)
-                    vhost = optionchecker("v");
-                setVirtualhost(vhost);
-            }
-            if (checkoptionsetting("top") || checkoptionsetting("t"))
-            {
-                String number = optionchecker("top");
-                if (number == null)
-                    number = optionchecker("t");
-
-                setnumber(removeSpaces(number));
-            }
-            this.viewmessages();
-        }
-        else if (checkoptionsetting("h") || checkoptionsetting("help"))
-            printusage();
-        else
-            unrecognizeoption();
-    }
-
-    public void printusage()
-    {
-        echo("");
-        echo("Usage:view [OPTION] ... [OBJECT TYPE]...\n");
-        echo("view the information about given number of messages from the given queue object\n");
-        echo("To specify the desired queue you have to give the virtualhost name and the queue name with following commands\n");
-        echo("Where possible options include:\n");
-        echo("        -v      --virtualhost Give the virtuallhost name of the desired queue");
-        echo("        -n      --name        Give the queue name of the desired queue you want to view messages");
-        echo("        -t      --top         Give how many number of messages you want to delete from the top (Default = all the messages will be deleted");
-        echo("        -h      --help        Display the help and back to the qpid-cli prompt\n");
-
-    }
-
-    private void setnumber(String number)
-    {
-        Integer i = new Integer(number);
-        this.number = i.intValue();
-    }
-
-    private static String removeSpaces(String s)
-    {
-        StringTokenizer st = new StringTokenizer(s, " ", false);
-        String t = "";
-        while (st.hasMoreElements())
-            t += st.nextElement();
-        return t;
-    }
-
-    public int getnumber()
-    {
-        return number;
-    }
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandviewcontent.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandviewcontent.java
deleted file mode 100644
index d1ae1c1893..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandviewcontent.java
+++ /dev/null
@@ -1,248 +0,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.
- *
- */
-package org.apache.qpid.commands;
-
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.openmbean.CompositeData;
-
-import org.apache.qpid.commands.objects.QueueObject;
-import org.apache.qpid.utils.JMXinfo;
-
-public class Commandviewcontent extends CommandImpl
-{
-
-    public static final String COMMAND_NAME = "viewcontent";
-
-    private long number = 0;
-    private QueueObject objname;
-    private MBeanServerConnection mbsc;
-    private String method1;
-    private ObjectName queue;
-
-    public Commandviewcontent(JMXinfo info)
-    {
-        super(info);
-        this.mbsc = info.getmbserverconnector();
-        this.objname = new QueueObject(mbsc);
-        this.method1 = "viewMessageContent";
-
-    }
-
-    public void viewcontent()
-    {
-        objname.setQueryString(getObject(), getName(), getVirtualhost());
-        Set set = objname.returnObjects();
-        String temp_header = "", header = "", message_data = "", encoding = null;
-
-        if (objname.getSet().size() != 0)
-        {
-            Iterator it = set.iterator();
-            this.queue = (ObjectName) it.next();
-            try
-            {
-                if (objname.getmessagecount(this.queue) == 0)
-                {
-                    echo("Selected Queue doesn't contain any messages");
-                    return;
-                }
-                if (this.number == 0)
-                {
-                    echo("You haven't selected a MessageId Please use -id and give a message id");
-                    echo("Or run view command with same arguemnts to view messageId list for the queue");
-                }
-                else
-                {
-                    Object[] params = { this.number };
-                    String[] signature = { new String("long") };
-                    CompositeData data = (CompositeData) this.mbsc.invoke(queue, this.method1, params, signature);
-                    List<String> itemNames = new ArrayList<String>(data.getCompositeType().keySet());
-                    for (int j = 0; j < itemNames.size(); j++)
-                    {
-                        temp_header = "";
-                        temp_header = itemNames.get(j);
-                        while (temp_header.length() < 15)
-                            temp_header = " " + temp_header;
-
-                        header = header + temp_header + "|";
-                    }
-                    echo(header);
-                    encoding = String.valueOf(data.get(itemNames.get(2))); // set
-                                                                           // the
-                                                                           // encoding
-                                                                           // at
-                                                                           // the
-                                                                           // beginning
-                                                                           // because
-                                                                           // encoding
-                                                                           // comes
-                                                                           // later
-                                                                           // in
-                                                                           // the
-                                                                           // loop
-                    if (encoding == null || encoding.length() == 0)
-                    {
-                        encoding = Charset.defaultCharset().name();
-
-                    }
-                    for (int j = 0; j < itemNames.size(); j++)
-                    {
-                        temp_header = "";
-                        if (j != 1)
-                        {
-                            temp_header = String.valueOf(data.get(itemNames.get(j)));
-                            while (temp_header.length() < 15)
-                                temp_header = " " + temp_header;
-                        }
-                        else
-                        {
-                            Byte[] arrayItems = (Byte[]) data.get(itemNames.get(j));
-                            byte[] byteArray = new byte[arrayItems.length];
-                            for (int i = 0; i < arrayItems.length; i++)
-                            {
-                                byteArray[i] = arrayItems[i];
-                                temp_header = new String(byteArray, encoding);
-                                while (temp_header.length() < 15)
-                                    temp_header = " " + temp_header;
-                            }
-                        }
-                        message_data = message_data + temp_header + "|";
-
-                    }
-                    echo(message_data);
-                }
-            }
-            catch (Exception ex)
-            {
-                echo("Given MessageId is invalid, There's no message with the given messageId");
-                ex.printStackTrace();
-                return;
-            }
-
-        }
-        else
-        {
-            if (hasName())
-            {
-
-                echo("The Queue you have specified is not in the current broker");
-                echo("");
-            }
-            else
-            {
-                printusage();
-            }
-        }
-    }
-
-    public void execute()
-    {
-        /*
-         * In here you it's easy to handle any number of otpions which are going
-         * to add with the list command which works with main option object or o
-         */
-
-        if (checkoptionsetting("object") || checkoptionsetting("o"))
-        {
-            String object = optionchecker("object");
-            if (object == null)
-            {
-                object = optionchecker("o");
-            }
-            if (object.compareToIgnoreCase("queue") == 0)
-                setObject(object);
-            else
-            {
-                unrecognizeoption();
-                echo("This command is only applicable for delete command so please start with queue");
-            }
-            if (checkoptionsetting("name") || checkoptionsetting("n"))
-            {
-                String name = optionchecker("name");
-                if (name == null)
-                    name = optionchecker("n");
-
-                setName(name);
-            }
-            if (checkoptionsetting("virtualhost") || checkoptionsetting("v"))
-            {
-                String vhost = optionchecker("virtualhost");
-                if (vhost == null)
-                    vhost = optionchecker("v");
-                setVirtualhost(vhost);
-            }
-            if (checkoptionsetting("messageid") || checkoptionsetting("id"))
-            {
-                String number = optionchecker("id");
-                if (number == null)
-                    number = optionchecker("id");
-
-                setnumber(removeSpaces(number));
-            }
-            this.viewcontent();
-        }
-        else if (checkoptionsetting("h") || checkoptionsetting("help"))
-            printusage();
-        else
-            unrecognizeoption();
-    }
-
-    public void printusage()
-    {
-        echo("");
-        echo("Usage:viewcontent [OPTION] ... [OBJECT TYPE]...\n");
-        echo("view the information about given number of messages from the given queue object\n");
-        echo("To specify the desired queue you have to give the virtualhost name and the queue name with following commands\n");
-        echo("Where possible options include:\n");
-        echo("        -v      --virtualhost Give the virtuallhost name of the desired queue");
-        echo("        -n      --name        Give the queue name of the desired queue you want to view messages");
-        echo("        -id                   Give the messageId of the required message you want to view the content");
-        echo("        -h      --help        Display the help and back to the qpid-cli prompt\n");
-
-    }
-
-    private void setnumber(String number)
-    {
-        this.number = Long.valueOf(number);
-    }
-
-    private static String removeSpaces(String s)
-    {
-        StringTokenizer st = new StringTokenizer(s, " ", false);
-        String t = "";
-        while (st.hasMoreElements())
-            t += st.nextElement();
-        return t;
-    }
-
-    public long getnumber()
-    {
-        return this.number;
-    }
-
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/AllObjects.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/AllObjects.java
deleted file mode 100644
index 8b2099f3e0..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/AllObjects.java
+++ /dev/null
@@ -1,38 +0,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.
- *
- */
-
-package org.apache.qpid.commands.objects;
-
-import javax.management.MBeanServerConnection;
-
-public class AllObjects extends ObjectNames
-{
-
-    public AllObjects(MBeanServerConnection mbsc)
-    {
-        super(mbsc);
-    }
-
-    public void setQueryString(String object, String name)
-    {
-        querystring = "org.apache.qpid:*";
-    }
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ConnectionObject.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ConnectionObject.java
deleted file mode 100644
index 2746b2016f..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ConnectionObject.java
+++ /dev/null
@@ -1,46 +0,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.
- *
- */
-
-package org.apache.qpid.commands.objects;
-
-import javax.management.MBeanServerConnection;
-
-public class ConnectionObject extends ObjectNames
-{
-    public ConnectionObject(MBeanServerConnection mbsc)
-    {
-        /* calling parent classes constructor */
-        super(mbsc);
-    }
-
-    public void setQueryString(String object, String name, String vhost)
-    {
-        if (name != null && vhost == null)
-            querystring = "org.apache.qpid:type=Connection,name=" + name + ",*";
-        else if (name != null && vhost != null)
-            querystring = "org.apache.qpid:type=Connection,VirtualHost=" + vhost + ",name=" + name + ",*";
-        else if (name == null && vhost != null)
-            querystring = "org.apache.qpid:type=Connection,VirtualHost=" + vhost + ",*";
-        else
-            querystring = "org.apache.qpid:type=Connection,*";
-
-    }
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ExchangeObject.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ExchangeObject.java
deleted file mode 100644
index 96d7e6e5dc..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ExchangeObject.java
+++ /dev/null
@@ -1,45 +0,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.
- *
- */
-
-package org.apache.qpid.commands.objects;
-
-import javax.management.MBeanServerConnection;
-
-public class ExchangeObject extends ObjectNames
-{
-    public ExchangeObject(MBeanServerConnection mbsc)
-    {
-        super(mbsc);
-    }
-
-    public void setQueryString(String object, String name, String vhost)
-    {
-        if (name != null && vhost == null)
-            querystring = "org.apache.qpid:type=VirtualHost.Exchange,name=" + name + ",*";
-        else if (name != null && vhost != null)
-            querystring = "org.apache.qpid:type=VirtualHost.Exchange,VirtualHost=" + vhost + ",name=" + name + ",*";
-        else if (name == null && vhost != null)
-            querystring = "org.apache.qpid:type=VirtualHost.Exchange,VirtualHost=" + vhost + ",*";
-        else
-            querystring = "org.apache.qpid:type=VirtualHost.Exchange,*";
-
-    }
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ObjectNames.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ObjectNames.java
deleted file mode 100644
index 1432f18018..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/ObjectNames.java
+++ /dev/null
@@ -1,591 +0,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.
- *
- */
-
-package org.apache.qpid.commands.objects;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.management.Attribute;
-import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanInfo;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-import org.apache.qpid.management.common.mbeans.ManagedQueue;
-
-public class ObjectNames
-{
-    public String querystring = null;
-    public MBeanServerConnection mbsc;
-    public Set<ObjectName> set = null;
-    public String attributes = "";
-    public String attributevalues = "";// = null;
-    
-    private static final Map<String,Integer> QUEUE_ATTRIBUTES = new HashMap<String,Integer>();
-    static
-    {
-        QUEUE_ATTRIBUTES.put(ManagedQueue.ATTR_NAME, 1);
-        QUEUE_ATTRIBUTES.put(ManagedQueue.ATTR_DURABLE, 2);
-        QUEUE_ATTRIBUTES.put(ManagedQueue.ATTR_ACTIVE_CONSUMER_COUNT, 3);
-        QUEUE_ATTRIBUTES.put(ManagedQueue.ATTR_MSG_COUNT, 4);
-        QUEUE_ATTRIBUTES.put(ManagedQueue.ATTR_RCVD_MSG_COUNT, 5);
-    }
-
-    public ObjectNames(MBeanServerConnection mbsc)
-    {
-        this.mbsc = mbsc;
-    }
-
-    public Set<ObjectName> returnObjects()
-    {
-        try
-        {
-            set = mbsc.queryNames(new ObjectName(querystring), null);
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-        return set;
-    }
-
-    public void echo(String str)
-    {
-        System.out.println(str);
-    }
-
-    /* display appropriate objects according to the ojbect type */
-
-    public void displayobjects(String output, String seperator)
-    {
-        Iterator it = set.iterator();
-        String line = "";
-        String temp2 = "";
-        int iterator = 0;
-        try
-        {
-            do
-            {
-                ObjectName temp_object = null;
-                if (it.hasNext())
-                {
-                    temp_object = (ObjectName) it.next();
-                    if (temp_object == null)
-                        System.out.println("null test");
-                }
-                // echo(temp_object.getCanonicalKeyPropertyListString());
-                MBeanInfo bean_info = mbsc.getMBeanInfo(temp_object);
-                MBeanAttributeInfo[] attr_info = bean_info.getAttributes();
-                if (attr_info == null)
-                {
-                    echo(temp_object.toString());
-                    String temp = "";
-                    while (temp_object.toString().length() > temp.length())
-                        temp = "=" + temp;
-                    if (output == null)
-                        echo(temp);
-
-                }
-                else
-                {
-                    for (MBeanAttributeInfo attr : attr_info)
-                    {
-                        Object toWrite = null;
-
-                        try
-                        {
-                            String temp1 = attr.getName();
-                            if (output == null)
-                            {
-                                while (temp1.length() < 15)
-                                    temp1 = " " + temp1;
-                                attributes = attributes + temp1 + "|";
-                            }
-                            else if (output.compareToIgnoreCase("csv") == 0)
-                                attributes = attributes + temp1 + seperator;
-                            else
-                            {
-                                echo("Wrong output format current version is supporting only for CSV");
-                                return;
-                            }
-                        }
-                        catch (Exception x)
-                        {
-                            x.printStackTrace();
-                        }
-                    }
-                    if (attributes.equalsIgnoreCase(""))
-                    {
-                        echo(temp_object.toString());
-                        String temp = "";
-                        while (temp_object.toString().length() > temp.length())
-                            temp = "=" + temp;
-                        echo(temp);
-                        echo("There are no attributes for this object Type");
-                        continue;
-                    }
-                    for (MBeanAttributeInfo attr : attr_info)
-                    {
-                        Object toWrite = null;
-                        temp2 = null;
-                        try
-                        {
-                            toWrite = mbsc.getAttribute(temp_object, attr.getName());
-                        }
-                        catch (Exception x)
-                        {
-                            temp2 = "-";
-                        }
-                        if (toWrite != null)
-                            temp2 = toWrite.toString();
-                        else
-                            temp2 = "-";
-                        if (output == null)
-                        {
-
-                            while (temp2.length() < 15)
-                                temp2 = " " + temp2;
-
-                            attributevalues = attributevalues + temp2 + "|";
-                        }
-                        else if (output.compareToIgnoreCase("csv") == 0)
-                            attributevalues = attributevalues + temp2 + seperator;
-
-                        // echo(temp1 + "     " + temp2 + "      " + temp3);
-
-                    }
-                }
-                iterator++;
-                if (iterator == 1)
-                {
-                    echo(attributes);
-                    for (int i = 0; i < attributes.length(); i++)
-                        line = line + "-";
-                    if (output == null)
-                        echo(line);
-                }
-                echo(attributevalues);
-                line = "";
-                attributes = "";
-                attributevalues = "";
-            } while (it.hasNext());
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-
-    }
-
-    public void reportgenerator(String output, String seperator, List<String> column)
-    {
-        Iterator it = set.iterator();
-        String line = "";
-        String temp2 = "";
-        int iterator = 0;
-        try
-        {
-            do
-            {
-                ObjectName temp_object = null;
-                if (it.hasNext())
-                {
-                    temp_object = (ObjectName) it.next();
-                    if (temp_object == null)
-                        System.out.println("null test");
-                }
-                // echo(temp_object.getCanonicalKeyPropertyListString());
-                MBeanInfo bean_info = mbsc.getMBeanInfo(temp_object);
-                MBeanAttributeInfo[] attr_info = bean_info.getAttributes();
-                if (attr_info == null)
-                {
-                    echo(temp_object.toString());
-                    String temp = "";
-                    while (temp_object.toString().length() > temp.length())
-                        temp = "=" + temp;
-                    if (output == null)
-                        echo(temp);
-
-                }
-                else
-                {
-                    for (MBeanAttributeInfo attr : attr_info)
-                    {
-                        Object toWrite = null;
-
-                        try
-                        {
-                            String temp1 = attr.getName();
-                            if (column.contains(temp1))
-                            {
-                                if (output == null)
-                                {
-                                    while (temp1.length() < 15)
-                                        temp1 = " " + temp1;
-                                    attributes = attributes + temp1 + "|";
-                                }
-                                else if (output.compareToIgnoreCase("csv") == 0)
-                                    attributes = attributes + temp1 + seperator;
-                                else
-                                {
-                                    echo("Wrong output format current version is supporting only for CSV");
-                                    return;
-                                }
-                            }
-                        }
-                        catch (Exception x)
-                        {
-                            x.printStackTrace();
-                        }
-                    }
-                    if (attributes.equalsIgnoreCase(""))
-                    {
-                        echo(temp_object.toString());
-                        String temp = "";
-                        while (temp_object.toString().length() > temp.length())
-                            temp = "=" + temp;
-                        echo(temp);
-                        echo("There are no attributes for this object Type");
-                        return;
-                    }
-                    for (MBeanAttributeInfo attr : attr_info)
-                    {
-                        Object toWrite = null;
-                        temp2 = null;
-                        if (column.contains(attr.getName()))
-                        {
-                            try
-                            {
-                                toWrite = mbsc.getAttribute(temp_object, attr.getName());
-                            }
-                            catch (Exception x)
-                            {
-                                temp2 = "-";
-                            }
-                            if (toWrite != null)
-                                temp2 = toWrite.toString();
-                            else
-                                temp2 = "-";
-                            if (output == null)
-                            {
-
-                                while (temp2.length() < 15)
-                                    temp2 = " " + temp2;
-
-                                attributevalues = attributevalues + temp2 + "|";
-                            }
-                            else if (output.compareToIgnoreCase("csv") == 0)
-                                attributevalues = attributevalues + temp2 + seperator;
-
-                            // echo(temp1 + "     " + temp2 + "      " + temp3);
-
-                        }
-
-                    }
-                }
-                iterator++;
-                if (iterator == 1)
-                {
-                    echo(attributes);
-                    for (int i = 0; i < attributes.length(); i++)
-                        line = line + "-";
-                    if (output == null)
-                        echo(line);
-                }
-                echo(attributevalues);
-                line = "";
-                attributes = "";
-                attributevalues = "";
-            } while (it.hasNext());
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-
-    }
-
-    public void displayqueues(String output, String seperator)
-    {
-        Iterator it = set.iterator();
-        String line = "";
-        int iterator = 0;
-        String temp1 = "";
-        String temp2 = "";
-        try
-        {
-            do
-            {
-                ObjectName temp_object = null;
-                if (it.hasNext())
-                {
-                    temp_object = (ObjectName) it.next();
-                }
-                // echo(temp_object.getCanonicalKeyPropertyListString());
-                MBeanInfo bean_info = mbsc.getMBeanInfo(temp_object);
-                MBeanAttributeInfo[] attr_info = bean_info.getAttributes();
-                if (attr_info == null)
-                {
-                    echo(temp_object.toString());
-                    String temp = "";
-                    while (temp_object.toString().length() > temp.length())
-                        temp = "=" + temp;
-                    if (output == null)
-                        echo(temp);
-
-                }
-                else
-                {
-                    for (MBeanAttributeInfo attr : attr_info)
-                    {
-                        Object toWrite = null;
-                        Integer attr_count = QUEUE_ATTRIBUTES.get(attr.getName());
-                        
-                        if(attr_count == null)
-                        {
-                            continue;
-                        }
-                        
-                        try
-                        {
-                            toWrite = mbsc.getAttribute(temp_object, attr.getName());
-                            if (output == null)
-                            {
-                                switch (attr_count)
-                                {
-                                case 1:
-                                case 2:
-                                    temp1 = attr.getName();
-                                    while (temp1.length() < 10)
-                                        temp1 = " " + temp1;
-                                    attributes = attributes + temp1 + "|";
-                                    temp2 = toWrite.toString();
-                                    while (temp2.length() < 10)
-                                        temp2 = " " + temp2;
-                                    attributevalues = attributevalues + temp2 + "|";
-                                    break;
-                                case 3:
-                                    temp1 = attr.getName();
-                                    while (temp1.length() < 20)
-                                        temp1 = " " + temp1;
-                                    attributes = attributes + temp1 + "|";
-                                    temp2 = toWrite.toString();
-                                    while (temp2.length() < 20)
-                                        temp2 = " " + temp2;
-                                    attributevalues = attributevalues + temp2 + "|";
-                                    break;
-                                case 4:
-                                    temp1 = attr.getName();
-                                    while (temp1.length() < 13)
-                                        temp1 = " " + temp1;
-                                    attributes = attributes + temp1 + "|";
-                                    temp2 = toWrite.toString();
-                                    while (temp2.length() < 13)
-                                        temp2 = " " + temp2;
-                                    attributevalues = attributevalues + temp2 + "|";
-                                    break;
-                                case 5:
-                                    temp1 = attr.getName();
-                                    while (temp1.length() < 20)
-                                        temp1 = " " + temp1;
-                                    attributes = attributes + temp1 + "|";
-                                    temp2 = toWrite.toString();
-                                    while (temp2.length() < 20)
-                                        temp2 = " " + temp2;
-                                    attributevalues = attributevalues + temp2 + "|";
-                                    break;
-                                }
-                            }
-                            else if (output.compareToIgnoreCase("csv") == 0)
-                            {
-                                temp1 = attr.getName();
-                                attributes = attributes + temp1 + seperator;
-                                temp2 = toWrite.toString();
-                                attributevalues = attributevalues + temp2 + seperator;
-                            }
-                            else
-                            {
-                                echo("Wrong output format specified currently CLI supports only csv output format");
-                                return;
-                            }
-
-                        }
-                        catch (Exception x)
-                        {
-                            x.printStackTrace();
-                        }
-
-                    }
-                }
-                iterator++;
-                if (iterator == 1)
-                {
-                    for (int i = 0; i < attributes.length(); i++)
-                        line = line + "-";
-                    if (output == null)
-                        echo(line);
-                    echo(attributes);
-                    if (output == null)
-                        echo(line);
-                }
-                echo(attributevalues);
-                line = "";
-                attributes = "";
-                attributevalues = "";
-            } while (it.hasNext());
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-    }
-
-    public void displayinfo(String output, String seperator)
-    {
-        Iterator it = set.iterator();
-        String temp1, temp2 = "";
-        try
-        {
-            do
-            {
-
-                ObjectName temp_object = null;
-                if (it.hasNext())
-                {
-                    temp_object = (ObjectName) it.next();
-                }
-                // echo(temp_object.getCanonicalKeyPropertyListString());
-                MBeanInfo bean_info = mbsc.getMBeanInfo(temp_object);
-                MBeanAttributeInfo[] attr_info = bean_info.getAttributes();
-                if (attr_info == null)
-                {
-                    echo(temp_object.toString());
-                    String temp = "";
-                    while (temp_object.toString().length() > temp.length())
-                        temp = "=" + temp;
-                    echo(temp);
-
-                }
-                else
-                {
-                    echo(temp_object.toString());
-                    String temp = "";
-                    while (temp_object.toString().length() > temp.length())
-                        temp = "=" + temp;
-                    echo(temp);
-
-                    for (MBeanAttributeInfo attr : attr_info)
-                    {
-                        Object toWrite = null;
-
-                        try
-                        {
-                            toWrite = mbsc.getAttribute(temp_object, attr.getName());
-                        }
-                        catch (Exception x)
-                        {
-                            temp2 = "-";
-                        }
-                        temp1 = attr.getName();
-                        if (toWrite != null)
-                            temp2 = toWrite.toString();
-
-                        if (output == null)
-                        {
-                            while (temp1.length() < 35)
-                                temp1 = " " + temp1;
-
-                            while (temp2.length() < 35)
-                                temp2 = " " + temp2;
-                            echo(temp1 + "     " + temp2);
-                        }
-                        else if (output.compareToIgnoreCase("csv") == 0)
-                            echo(temp1 + seperator + temp2);
-                        else
-                        {
-                            echo("Wrong output format specified currently CLI supports only csv output format");
-                            return;
-                        }
-                    }
-                    echo("");
-                    echo("");
-
-                }
-            } while (it.hasNext());
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-
-    }
-
-    public void setQueryString(String object, String name, String vhost)
-    {
-
-    }
-
-    public void setQueryStringforinfo(String object, String name, String virtualhost)
-    {
-
-    }
-
-    public String getQueryString()
-    {
-        return querystring;
-    }
-
-    public Set getSet()
-    {
-        return set;
-    }
-
-    public Object getAttribute(ObjectName object, String attribute)
-    {
-        try
-        {
-            return mbsc.getAttribute(object, attribute);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-
-    public void setAttribute(ObjectName object, Attribute attribute)
-    {
-        try
-        {
-            mbsc.setAttribute(object, attribute);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/QueueObject.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/QueueObject.java
deleted file mode 100644
index fcf0464ced..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/QueueObject.java
+++ /dev/null
@@ -1,67 +0,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.
- *
- */
-
-package org.apache.qpid.commands.objects;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-import org.apache.qpid.management.common.mbeans.ManagedQueue;
-
-public class QueueObject extends ObjectNames
-{
-    public QueueObject(MBeanServerConnection mbsc)
-    {
-        super(mbsc);
-    }
-
-    public void setQueryString(String object, String name, String vhost)
-    {
-        if (name != null && vhost == null)
-            querystring = "org.apache.qpid:type=VirtualHost.Queue,name=" + name + ",*";
-        else if (name != null && vhost != null)
-            querystring = "org.apache.qpid:type=VirtualHost.Queue,VirtualHost=" + vhost + ",name=" + name + ",*";
-        else if (name == null && vhost != null)
-            querystring = "org.apache.qpid:type=VirtualHost.Queue,VirtualHost=" + vhost + ",*";
-        else
-            querystring = "org.apache.qpid:type=VirtualHost.Queue,*";
-    }
-
-    public int getmessagecount(ObjectName queue)
-    {
-        Number depth = null;
-        
-        try
-        {
-            depth = (Number) mbsc.getAttribute(queue, ManagedQueue.ATTR_MSG_COUNT);
-            
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-        if (depth != null)
-            return depth.intValue();
-        else
-            return -1;
-    }
-
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/UserManagementObject.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/UserManagementObject.java
deleted file mode 100644
index fd5bc0ca72..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/UserManagementObject.java
+++ /dev/null
@@ -1,38 +0,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.
- *
- */
-
-package org.apache.qpid.commands.objects;
-
-import javax.management.MBeanServerConnection;
-
-public class UserManagementObject extends ObjectNames
-{
-    public UserManagementObject(MBeanServerConnection mbsc)
-    {
-        super(mbsc);
-    }
-
-    public void setQueryString(String object, String name, String vhost)
-    {
-        querystring = "org.apache.qpid:type=UserManagement,*";
-    }
-
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/VirtualHostObject.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/VirtualHostObject.java
deleted file mode 100644
index 77f8b66ac0..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/commands/objects/VirtualHostObject.java
+++ /dev/null
@@ -1,47 +0,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.
- *
- */
-
-package org.apache.qpid.commands.objects;
-
-import javax.management.MBeanServerConnection;
-
-public class VirtualHostObject extends ObjectNames
-{
-
-    public VirtualHostObject(MBeanServerConnection mbsc)
-    {
-        super(mbsc);
-    }
-
-    public void setQueryString(String object, String name, String vhost)
-    {
-        if (name != null && vhost == null)
-            querystring = "org.apache.qpid:type=VirtualHost.VirtualHostManager,name=" + name + ",*";
-        else if (name != null && vhost != null)
-            querystring = "org.apache.qpid:type=VirtualHost.VirtualHostManager,VirtualHost=" + vhost + ",name=" + name
-                    + ",*";
-        else if (name == null && vhost != null)
-            querystring = "org.apache.qpid:type=VirtualHost.VirtualHostManager,VirtualHost=" + vhost + ",*";
-        else
-            querystring = "org.apache.qpid:type=VirtualHost.VirtualHostManager,*";
-
-    }
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/CommandLineOption.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/CommandLineOption.java
deleted file mode 100644
index a443d6f789..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/CommandLineOption.java
+++ /dev/null
@@ -1,104 +0,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.
- *
- */
-
-package org.apache.qpid.utils;
-
-import java.util.ArrayList;
-
-public class CommandLineOption implements CommandLineOptionConstants
-{
-    private String type;
-    private ArrayList optionValues;
-
-    public CommandLineOption(String type, String[] values)
-    {
-        setOptionType(type);
-        ArrayList arrayList = new ArrayList(values.length);
-        for (int i = 0; i < values.length; i++)
-        {
-            arrayList.add(values[i]);
-        }
-        this.optionValues = arrayList;
-    }
-
-    private void setOptionType(String type)
-    {
-        // cater for the long options first
-        if (type.startsWith("--"))
-        {
-            type = type.replaceFirst("--", "");
-        }
-        if (type.startsWith("-"))
-        {
-            type = type.replaceFirst("-", "");
-        }
-
-        // we do not change the case of the option!
-
-        this.type = type;
-    }
-
-    /**
-     * @param type
-     */
-    public CommandLineOption(String type, ArrayList values)
-    {
-        setOptionType(type);
-
-        if (null != values)
-        {
-            this.optionValues = values;
-        }
-    }
-
-    /**
-     * @return Returns the type.
-     * @see CommandLineOptionConstants
-     */
-    public String getOptionType()
-    {
-        return type;
-    }
-
-    /**
-     * @return Returns the optionValues.
-     */
-    public String getOptionValue()
-    {
-        if ((optionValues != null) && (optionValues.size() > 0))
-        {
-            return (String) optionValues.get(0);
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    /**
-     * @return Returns the optionValues.
-     */
-    public ArrayList getOptionValues()
-    {
-        return optionValues;
-    }
-
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/CommandLineOptionConstants.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/CommandLineOptionConstants.java
deleted file mode 100644
index be82dbfcaa..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/CommandLineOptionConstants.java
+++ /dev/null
@@ -1,37 +0,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.
- *
- */
-
-package org.apache.qpid.utils;
-
-public interface CommandLineOptionConstants
-{
-    static interface JMXCommandLineOptionConstants
-    {
-        String HOST_OPTION = "h";
-        String PORT_OPTION = "p";
-        String INTERVAL_OPTION = "i";
-        String REPORT_OPTION = "r";
-        String USER_OPTION = "u";
-        String PASSWORD_OPTION = "w";
-
-    }
-
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/CommandLineOptionParser.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/CommandLineOptionParser.java
deleted file mode 100644
index fbf87bac01..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/CommandLineOptionParser.java
+++ /dev/null
@@ -1,231 +0,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.
- *
- */
-
-package org.apache.qpid.utils;
-
-import java.util.Map;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.StringTokenizer;
-
-public class CommandLineOptionParser
-{
-    private static int STARTED = 0;
-    private static int NEW_OPTION = 1;
-    private static int SUB_PARAM_OF_OPTION = 2;
-
-    private Map commandlineoption;
-    private String commandname;
-
-    public CommandLineOptionParser(Map commandlineoptions)
-    {
-        this.commandlineoption = commandlineoptions;
-    }
-
-    public CommandLineOptionParser(String[] args)
-    {
-        /* check whether user just type the enter key */
-        this.commandlineoption = this.parse(args);
-
-    }
-
-    public CommandLineOptionParser(String[] args, String first)
-    {
-        this.commandname = first;
-        this.commandlineoption = this.parsefirst(args);
-    }
-
-    public Map parse(String[] args)
-    {
-        Map commandLineOptions = new HashMap();
-
-        if (0 == args.length)
-        {
-            return commandLineOptions;
-        }
-        else if (1 == args.length)
-        {
-            commandname = args[0];
-            return commandLineOptions;
-        }
-        /* when user is not giving the command line option with a "=" */
-        // if (!args[2].startsWith("-"))
-        // return commandLineOptions;
-        // State 0 means started
-        // State 1 means earlier one was a new -option
-        // State 2 means earlier one was a sub param of a -option
-        int state = STARTED;
-        ArrayList optionBundle = null;
-        String optionType = null;
-        CommandLineOption commandLineOption;
-        String newcommand = "";
-        String[] newargs;
-        int j;
-        if (args[1].compareTo("list") == 0 || args[1].compareTo("info") == 0 || args[1].compareTo("delete") == 0
-                || args[1].compareTo("move") == 0 || args[1].compareTo("view") == 0
-                || args[1].compareTo("viewcontent") == 0)
-        {
-            String object = args[0];
-            for (j = 0; j < (args.length - 1); j++)
-            {
-                newcommand = newcommand + args[j + 1] + " ";
-            }
-            newcommand = newcommand + "-o " + object;
-            newargs = newcommand.split(" ");
-            args = newargs;
-        }
-        else if (!args[1].startsWith("-")) // if user give command like list
-                                           // queue or something without minus
-                                           // argument
-            return commandLineOptions; // for the second wordxi
-
-        commandname = args[0];
-        for (int i = 0; i < args.length; i++)
-        {
-            if (args[i].startsWith("-"))
-            {
-                if (STARTED == state)
-                {
-                    // fresh one
-                    state = NEW_OPTION;
-                    optionType = args[i];
-                }
-                else if (SUB_PARAM_OF_OPTION == state || NEW_OPTION == state)
-                {
-                    // new one but old one should be saved
-                    commandLineOption = new CommandLineOption(optionType, optionBundle);
-                    commandLineOptions.put(commandLineOption.getOptionType(), commandLineOption);
-                    state = NEW_OPTION;
-                    optionType = args[i];
-                    optionBundle = null;
-
-                }
-            }
-            else
-            {
-                if (NEW_OPTION == state)
-                {
-                    optionBundle = new ArrayList();
-                    optionBundle.add(args[i]);
-                    state = SUB_PARAM_OF_OPTION;
-
-                }
-                else if (SUB_PARAM_OF_OPTION == state)
-                {
-                    optionBundle.add(args[i]);
-                }
-
-            }
-        }
-        commandLineOption = new CommandLineOption(optionType, optionBundle);
-        commandLineOptions.put(commandLineOption.getOptionType(), commandLineOption);
-        return commandLineOptions;
-
-    }
-
-    public Map parsefirst(String[] args)
-    {
-        Map commandLineOptions = new HashMap();
-        if (0 == args.length)
-        {
-            return commandLineOptions;
-        }
-        else if (1 == args.length)
-        {
-            return commandLineOptions;
-        }
-        /* when user is not giving the command line option with a "=" */
-        // if (!args[2].startsWith("-"))
-        // return commandLineOptions;
-        // State 0 means started
-        // State 1 means earlier one was a new -option
-        // State 2 means earlier one was a sub param of a -option
-        int state = STARTED;
-        ArrayList optionBundle = null;
-        String optionType = null;
-        CommandLineOption commandLineOption;
-        String newcommand = "";
-        String[] newargs;
-        int j;
-
-        for (int i = 0; i < args.length; i++)
-        {
-            if (args[i].startsWith("-"))
-            {
-                if (STARTED == state)
-                {
-                    // fresh one
-                    state = NEW_OPTION;
-                    optionType = args[i];
-                }
-                else if (SUB_PARAM_OF_OPTION == state || NEW_OPTION == state)
-                {
-                    // new one but old one should be saved
-                    commandLineOption = new CommandLineOption(optionType, optionBundle);
-                    commandLineOptions.put(commandLineOption.getOptionType(), commandLineOption);
-                    state = NEW_OPTION;
-                    optionType = args[i];
-                    optionBundle = null;
-
-                }
-            }
-            else
-            {
-                if (NEW_OPTION == state)
-                {
-                    optionBundle = new ArrayList();
-                    optionBundle.add(args[i]);
-                    state = SUB_PARAM_OF_OPTION;
-
-                }
-                else if (SUB_PARAM_OF_OPTION == state)
-                {
-                    optionBundle.add(args[i]);
-                }
-
-            }
-        }
-        commandLineOption = new CommandLineOption(optionType, optionBundle);
-        commandLineOptions.put(commandLineOption.getOptionType(), commandLineOption);
-        return commandLineOptions;
-
-    }
-
-    public Map getAlloptions()
-    {
-        return this.commandlineoption;
-    }
-
-    public String getcommandname()
-    {
-        return this.commandname;
-    }
-
-    private static String removeSpaces(String s)
-    {
-        StringTokenizer st = new StringTokenizer(s, " ", false);
-        String t = "";
-        while (st.hasMoreElements())
-            t += st.nextElement();
-        return t;
-    }
-
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/JMXConfigProperty.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/JMXConfigProperty.java
deleted file mode 100644
index 55240054a9..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/JMXConfigProperty.java
+++ /dev/null
@@ -1,29 +0,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.
- *
- */
-package org.apache.qpid.utils;
-
-public class JMXConfigProperty
-{
-
-    private static final String DEFAULT_HOST_NAME = "localhost";
-    private static final String DEFAULT_PORT = "8999";
-    private static final String DEFAULT_INTERVAL = "4000";
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/JMXConfiguration.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/JMXConfiguration.java
deleted file mode 100644
index 76aab11e25..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/JMXConfiguration.java
+++ /dev/null
@@ -1,182 +0,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.
- *
- */
-package org.apache.qpid.utils;
-
-import java.util.Map;
-
-public class JMXConfiguration
-{
-    private String hostname = "localhost";
-    private String port = "8999";
-    private String interval = "40000";
-    private String outputpath = ".";
-    private String report_file = "report.output";
-    private boolean isreport_mode = false;
-    private String username = null;
-    private String password = null;
-
-    public JMXConfiguration(Map map)
-    {
-        if (checkoptionsetting(CommandLineOptionConstants.JMXCommandLineOptionConstants.HOST_OPTION, map))
-        {
-            this.hostname = optionchecker(CommandLineOptionConstants.JMXCommandLineOptionConstants.HOST_OPTION, map);
-        }
-        if (checkoptionsetting(CommandLineOptionConstants.JMXCommandLineOptionConstants.PORT_OPTION, map))
-        {
-            this.port = optionchecker(CommandLineOptionConstants.JMXCommandLineOptionConstants.PORT_OPTION, map);
-        }
-        if (checkoptionsetting(CommandLineOptionConstants.JMXCommandLineOptionConstants.REPORT_OPTION, map))
-        {
-
-            this.report_file = optionchecker(CommandLineOptionConstants.JMXCommandLineOptionConstants.REPORT_OPTION,
-                    map);
-        }
-        if (checkoptionsetting(CommandLineOptionConstants.JMXCommandLineOptionConstants.USER_OPTION, map))
-        {
-
-            this.setUsername(optionchecker(CommandLineOptionConstants.JMXCommandLineOptionConstants.USER_OPTION, map));
-        }
-
-        if (checkoptionsetting(CommandLineOptionConstants.JMXCommandLineOptionConstants.PASSWORD_OPTION, map))
-        {
-            this.setPassword(optionchecker(CommandLineOptionConstants.JMXCommandLineOptionConstants.PASSWORD_OPTION,
-                    map));
-        }
-
-    }
-
-    public void sethostname(String hostname)
-    {
-        this.hostname = hostname;
-    }
-
-    public void setport(String port)
-    {
-        this.port = port;
-    }
-
-    public void setinterval(String interval)
-    {
-        this.interval = interval;
-    }
-
-    public void setoutputpath(String output)
-    {
-        this.outputpath = output;
-    }
-
-    public String gethostname()
-    {
-        return this.hostname;
-    }
-
-    public String getport()
-    {
-        return this.port;
-    }
-
-    public String getinterval()
-    {
-        return this.interval;
-    }
-
-    public String getoutputpath()
-    {
-        return this.outputpath;
-    }
-
-    public CommandLineOption loadoption(String option, Map options)
-    {
-        CommandLineOption op = null;
-        if (option != null)
-        {
-            op = (CommandLineOption) options.get(option);
-
-        }
-        return op;
-
-    }
-
-    public void setreportfile(String reportfile)
-    {
-        this.report_file = reportfile;
-        this.isreport_mode = true;
-
-    }
-
-    public boolean isreportmode()
-    {
-        return this.isreport_mode;
-    }
-
-    public String getreportfile()
-    {
-        return this.report_file;
-    }
-
-    public String optionchecker(String option_letter, Map map)
-    {
-
-        if (map == null)
-            return null;
-        CommandLineOption option = (CommandLineOption) map.get(option_letter);
-        if (option == null)
-            return null;
-        String value = option.getOptionValue();
-        return value;
-    }
-
-    public boolean checkoptionsetting(String option_letter, Map map)
-    {
-        if (map == null)
-            return false;
-        CommandLineOption option = (CommandLineOption) map.get(option_letter);
-        if (option == null)
-            return false;
-        String value = option.getOptionType();
-
-        if (value != null)
-            return true;
-        else
-            return false;
-    }
-
-    public void setUsername(String username)
-    {
-        this.username = username;
-    }
-
-    public String getUsername()
-    {
-        return username;
-    }
-
-    public void setPassword(String password)
-    {
-        this.password = password;
-    }
-
-    public String getPassword()
-    {
-        return password;
-    }
-
-}
diff --git a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/JMXinfo.java b/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/JMXinfo.java
deleted file mode 100644
index 09de4a248f..0000000000
--- a/qpid/java/management/tools/qpid-cli/src/org/apache/qpid/utils/JMXinfo.java
+++ /dev/null
@@ -1,53 +0,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.
- *
- */
-package org.apache.qpid.utils;
-
-import javax.management.remote.JMXConnector;
-import javax.management.MBeanServerConnection;
-
-public class JMXinfo
-{
-    private JMXConnector jmxconnector;
-    private CommandLineOptionParser input;
-    private MBeanServerConnection mbserverconnector;
-
-    public JMXinfo(JMXConnector jmxc, CommandLineOptionParser input, MBeanServerConnection mbsc)
-    {
-        this.jmxconnector = jmxc;
-        this.input = input;
-        this.mbserverconnector = mbsc;
-    }
-
-    public JMXConnector getjmxconnectot()
-    {
-        return jmxconnector;
-    }
-
-    public CommandLineOptionParser getCommandLineOptionParser()
-    {
-        return input;
-    }
-
-    public MBeanServerConnection getmbserverconnector()
-    {
-        return mbserverconnector;
-    }
-}