From 05b3bf8f25b004ec8761c4d52a6740f60cbd9d2d Mon Sep 17 00:00:00 2001
From: Rajith Muditha Attapattu <rajith@apache.org>
Date: Wed, 19 Sep 2007 23:29:44 +0000
Subject: merged the qpidity.url classes in to qpid.url and deleted qpidity.url

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@577464 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/qpid/url/BindingURLImpl.java   | 261 ++++++++++++
 .../java/org/apache/qpid/url/QpidBindingURL.java   |  53 +++
 .../src/main/java/org/apache/qpid/url/QpidURL.java |  57 +++
 .../main/java/org/apache/qpid/url/QpidURLImpl.java | 460 +++++++++++++++++++++
 .../java/org/apache/qpidity/url/BindingURL.java    |  53 ---
 .../org/apache/qpidity/url/BindingURLImpl.java     | 261 ------------
 .../main/java/org/apache/qpidity/url/QpidURL.java  |  57 ---
 .../java/org/apache/qpidity/url/QpidURLImpl.java   | 460 ---------------------
 .../java/org/apache/qpidity/url/URLHelper.java     | 169 --------
 .../org/apache/qpidity/url/URLSyntaxException.java |  94 -----
 10 files changed, 831 insertions(+), 1094 deletions(-)
 create mode 100644 java/common/src/main/java/org/apache/qpid/url/BindingURLImpl.java
 create mode 100644 java/common/src/main/java/org/apache/qpid/url/QpidBindingURL.java
 create mode 100644 java/common/src/main/java/org/apache/qpid/url/QpidURL.java
 create mode 100644 java/common/src/main/java/org/apache/qpid/url/QpidURLImpl.java
 delete mode 100644 java/common/src/main/java/org/apache/qpidity/url/BindingURL.java
 delete mode 100644 java/common/src/main/java/org/apache/qpidity/url/BindingURLImpl.java
 delete mode 100644 java/common/src/main/java/org/apache/qpidity/url/QpidURL.java
 delete mode 100644 java/common/src/main/java/org/apache/qpidity/url/QpidURLImpl.java
 delete mode 100644 java/common/src/main/java/org/apache/qpidity/url/URLHelper.java
 delete mode 100644 java/common/src/main/java/org/apache/qpidity/url/URLSyntaxException.java

(limited to 'java/common/src')

diff --git a/java/common/src/main/java/org/apache/qpid/url/BindingURLImpl.java b/java/common/src/main/java/org/apache/qpid/url/BindingURLImpl.java
new file mode 100644
index 0000000000..2cf035f601
--- /dev/null
+++ b/java/common/src/main/java/org/apache/qpid/url/BindingURLImpl.java
@@ -0,0 +1,261 @@
+/* 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.url;
+
+import org.apache.qpidity.exchange.ExchangeDefaults;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+
+import java.util.HashMap;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+public class BindingURLImpl implements QpidBindingURL
+{
+    private static final Logger _logger = LoggerFactory.getLogger(BindingURLImpl.class);
+
+    String _url;
+    String _exchangeClass;
+    String _exchangeName;
+    String _destinationName;
+    String _queueName;
+    private HashMap<String, String> _options;
+
+    public BindingURLImpl(String url) throws URLSyntaxException
+    {
+        // format:
+        // <exch_class>://<exch_name>/[<destination>]/[<queue>]?<option>='<value>'[,<option>='<value>']*
+        if (_logger.isDebugEnabled())
+        {
+            _logger.debug("Parsing URL: " + url);
+        }
+        _url = url;
+        _options = new HashMap<String, String>();
+        parseBindingURL();
+    }
+
+    private void parseBindingURL() throws URLSyntaxException
+    {
+        try
+        {
+            URI connection = new URI(_url);
+            String exchangeClass = connection.getScheme();
+            if (exchangeClass == null)
+            {
+                _url = ExchangeDefaults.DIRECT_EXCHANGE_CLASS + "://" + "" + "//" + _url;
+                // URLHelper.parseError(-1, "Exchange Class not specified.", _url);
+                parseBindingURL();
+                return;
+            }
+            else
+            {
+                setExchangeClass(exchangeClass);
+            }
+            String exchangeName = connection.getHost();
+            if (exchangeName == null)
+            {
+                if (getExchangeClass().equals(ExchangeDefaults.DIRECT_EXCHANGE_CLASS))
+                {
+                    setExchangeName("");
+                }
+                else
+                {
+                    throw URLHelper.parseError(-1, "Exchange Name not specified.", _url);
+                }
+            }
+            else
+            {
+                setExchangeName(exchangeName);
+            }
+            String queueName;
+            if ((connection.getPath() == null) || connection.getPath().equals(""))
+            {
+                throw URLHelper.parseError(_url.indexOf(_exchangeName) + _exchangeName.length(),
+                                           "Destination or Queue requried", _url);
+            }
+            else
+            {
+                int slash = connection.getPath().indexOf("/", 1);
+                if (slash == -1)
+                {
+                    throw URLHelper.parseError(_url.indexOf(_exchangeName) + _exchangeName.length(),
+                                               "Destination requried", _url);
+                }
+                else
+                {
+                    String path = connection.getPath();
+                    setDestinationName(path.substring(1, slash));
+
+                    // We don't set queueName yet as the actual value we use depends on options set
+                    // when we are dealing with durable subscriptions
+
+                    queueName = path.substring(slash + 1);
+
+                }
+            }
+
+            URLHelper.parseOptions(_options, connection.getQuery());
+            processOptions();
+            // We can now call setQueueName as the URL is full parsed.
+            setQueueName(queueName);
+            // Fragment is #string (not used)
+            if (_logger.isDebugEnabled())
+            {
+                _logger.debug("URL Parsed: " + this);
+            }
+        }
+        catch (URISyntaxException uris)
+        {
+            throw URLHelper.parseError(uris.getIndex(), uris.getReason(), uris.getInput());
+        }
+    }
+
+
+    private void processOptions()
+    {
+        // this is where we would parse any options that needed more than just storage.
+    }
+
+    public String getURL()
+    {
+        return _url;
+    }
+
+    public String getExchangeClass()
+    {
+        return _exchangeClass;
+    }
+
+    private void setExchangeClass(String exchangeClass)
+    {
+
+        _exchangeClass = exchangeClass;
+        if (exchangeClass.equals(ExchangeDefaults.TOPIC_EXCHANGE_CLASS))
+        {
+            setOption(BindingURL.OPTION_EXCLUSIVE, "true");
+        }
+
+    }
+
+    public String getExchangeName()
+    {
+        return _exchangeName;
+    }
+
+    private void setExchangeName(String name)
+    {
+        _exchangeName = name;
+    }
+
+    public String getDestinationName()
+    {
+        return _destinationName;
+    }
+
+    private void setDestinationName(String name)
+    {
+        _destinationName = name;
+    }
+
+    public String getQueueName()
+    {
+        return _queueName;
+    }
+
+    public void setQueueName(String name) throws URLSyntaxException
+    {
+        if (_exchangeClass.equals(ExchangeDefaults.TOPIC_EXCHANGE_CLASS))
+        {
+            if (Boolean.parseBoolean(getOption(OPTION_DURABLE)))
+            {
+                if (containsOption(BindingURL.OPTION_CLIENTID) && containsOption(BindingURL.OPTION_SUBSCRIPTION))
+                {
+                    _queueName = getOption(BindingURL.OPTION_CLIENTID + ":" + BindingURL.OPTION_SUBSCRIPTION);
+                }
+                else
+                {
+                    throw URLHelper.parseError(-1,
+                                               "Durable subscription must have values for " + BindingURL.OPTION_CLIENTID + " and " + BindingURL.OPTION_SUBSCRIPTION + ".",
+                                               _url);
+
+                }
+            }
+            else
+            {
+                _queueName = null;
+            }
+        }
+        else
+        {
+            _queueName = name;
+        }
+
+    }
+
+    public String getOption(String key)
+    {
+        return _options.get(key);
+    }
+
+    public void setOption(String key, String value)
+    {
+        _options.put(key, value);
+    }
+
+    public boolean containsOption(String key)
+    {
+        return _options.containsKey(key);
+    }
+
+    public String getRoutingKey()
+    {
+        if (_exchangeClass.equals(ExchangeDefaults.DIRECT_EXCHANGE_CLASS))
+        {
+            return getQueueName();
+        }
+
+        if (containsOption(BindingURL.OPTION_ROUTING_KEY))
+        {
+            return getOption(OPTION_ROUTING_KEY);
+        }
+
+        return getDestinationName();
+    }
+
+    public void setRoutingKey(String key)
+    {
+        setOption(OPTION_ROUTING_KEY, key);
+    }
+
+    public String toString()
+    {
+        StringBuffer sb = new StringBuffer();
+
+        sb.append(_exchangeClass);
+        sb.append("://");
+        sb.append(_exchangeName);
+        sb.append('/');
+        sb.append(_destinationName);
+        sb.append('/');
+        sb.append(_queueName);
+
+        sb.append(URLHelper.printOptions(_options));
+
+        return sb.toString();
+    }
+}
diff --git a/java/common/src/main/java/org/apache/qpid/url/QpidBindingURL.java b/java/common/src/main/java/org/apache/qpid/url/QpidBindingURL.java
new file mode 100644
index 0000000000..00edbf1bc3
--- /dev/null
+++ b/java/common/src/main/java/org/apache/qpid/url/QpidBindingURL.java
@@ -0,0 +1,53 @@
+/* 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.url;
+
+import org.apache.qpid.framing.AMQShortString;
+
+/*
+    Binding URL format:
+    <exch_class>://<exch_name>/[<destination>]/[<queue>]?<option>='<value>'[,<option>='<value>']*
+*/
+public interface QpidBindingURL
+{
+    public static final String OPTION_EXCLUSIVE = "exclusive";
+    public static final String OPTION_AUTODELETE = "autodelete";
+    public static final String OPTION_DURABLE = "durable";
+    public static final String OPTION_CLIENTID = "clientid";
+    public static final String OPTION_SUBSCRIPTION = "subscription";
+    public static final String OPTION_ROUTING_KEY = "routingkey";
+
+
+    String getURL();
+
+   String getExchangeClass();
+
+    String getExchangeName();
+
+    String getDestinationName();
+
+    String getQueueName();
+
+    String getOption(String key);
+
+    boolean containsOption(String key);
+
+    String getRoutingKey();
+
+    String toString();
+}
diff --git a/java/common/src/main/java/org/apache/qpid/url/QpidURL.java b/java/common/src/main/java/org/apache/qpid/url/QpidURL.java
new file mode 100644
index 0000000000..1d94b31de2
--- /dev/null
+++ b/java/common/src/main/java/org/apache/qpid/url/QpidURL.java
@@ -0,0 +1,57 @@
+/* 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.url;
+
+import org.apache.qpidity.BrokerDetails;
+
+import java.util.List;
+
+/**
+ * The format of the Qpid URL is based on the AMQP one.
+ * The grammar is as follows:
+ * <p> qpid_url          = "qpid:" [user_props] prot_addr_list ["/" future-parameters]
+ * <p> prot_addr_list 	 = [prot_addr ","]* prot_addr
+ * <p> prot_addr         = tcp_prot_addr | tls_prot_addr | future_prot_addr
+ * <p> tcp_prot_addr     = tcp_id tcp_addr
+ * <p> tcp_id            = "tcp:" | ""
+ * <p> tcp_addr          = [host [":" port] ]
+ * <p> host              = <as per [2]>
+ * <p> port              = number
+ * <p> tls_prot_addr     = tls_id tls_addr
+ * <p> tls_id            = "tls:" | ""
+ * <p> tls_addr          = [host [":" port] ]
+ * <p> future_prot_addr  = future_prot_id future_prot_addr
+ * <p> future_prot_id    = <placeholder, must end in ":". Example "sctp:">
+ * <p> future_prot_addr  = <placeholder, protocl-specific address>
+ * <p> future_parameters = <placeholder, not used in failover addresses>
+ */
+public interface QpidURL
+{
+    /**
+     * Get all the broker details
+     *
+     * @return A list of BrokerDetails.
+     */
+    public List<BrokerDetails> getAllBrokerDetails();
+
+    /**
+     * Get this URL string form
+     * @return This URL string form.
+     */
+    public String getURL();
+}
diff --git a/java/common/src/main/java/org/apache/qpid/url/QpidURLImpl.java b/java/common/src/main/java/org/apache/qpid/url/QpidURLImpl.java
new file mode 100644
index 0000000000..b4a55e2bf4
--- /dev/null
+++ b/java/common/src/main/java/org/apache/qpid/url/QpidURLImpl.java
@@ -0,0 +1,460 @@
+/* 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.url;
+
+import org.apache.qpidity.BrokerDetails;
+import org.apache.qpidity.BrokerDetailsImpl;
+
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The format Qpid URL is based on the AMQP one.
+ * The grammar is as follows:
+ * <p> qpid_url          = "qpid:" [client_props "@"] port_addr_list ["/" future-parameters]
+ * <p> port_addr_list 	 = [port_addr ","]* port_addr
+ * <p> port_addr         = tcp_port_addr | tls_prot_addr | future_prot_addr
+ * <p> tcp_port_addr     = tcp_id tcp_addr
+ * <p> tcp_id            = "tcp:" | ""
+ * <p> tcp_addr          = host [":" port]
+ * <p> host              = <as per http://www.apps.ietf.org/>
+ * <p> port              = number
+ * <p> tls_prot_addr     = tls_id tls_addr
+ * <p> tls_id            = "tls:" | ""
+ * <p> tls_addr          = host [":" port]
+ * <p> future_prot_addr  = future_prot_id future_prot_addr
+ * <p> future_prot_id    = <placeholder, must end in ":". Example "sctp:">
+ * <p> future_prot_addr  = <placeholder, protocl-specific address>
+ * <p> future_parameters = <placeholder, not used in failover addresses>
+ * <p> client_props      = [client_prop ";"]*  client_prop
+ * <p> client_prop       = prop "=" val
+ * <p> prop              = chars as per <as per http://www.apps.ietf.org/>
+ * <p> val               = valid as per <as per http://www.apps.ietf.org/>
+ * <p/>
+ * Ex: qpid:virtualhost=tcp:host-foo,test,client_id=foo@tcp:myhost.com:5672,virtualhost=prod;
+ * keystore=/opt/keystore@client_id2@tls:mysecurehost.com:5672
+ */
+public class QpidURLImpl implements QpidURL
+{
+    private static final char[] URL_START_SEQ = new char[]{'q', 'p', 'i', 'd', ':'};
+    private static final char PROPERTY_EQUALS_CHAR = '=';
+    private static final char PROPERTY_SEPARATOR_CHAR = ';';
+    private static final char ADDRESS_SEPERATOR_CHAR = ',';
+
+    //private static final char CLIENT_ID_TRANSPORT_SEPARATOR_CHAR = ':';
+    private static final char TRANSPORT_HOST_SEPARATOR_CHAR = ':';
+    private static final char HOST_PORT_SEPARATOR_CHAR = ':';
+    private static final char AT_CHAR = '@';
+
+    enum URLParserState
+    {
+        QPID_URL_START,
+        ADDRESS_START,
+        PROPERTY_NAME,
+        PROPERTY_EQUALS,
+        PROPERTY_VALUE,
+        PROPERTY_SEPARATOR,
+        AT_CHAR,
+        //   CLIENT_ID,
+        //   CLIENT_ID_TRANSPORT_SEPARATOR,
+        TRANSPORT,
+        TRANSPORT_HOST_SEPARATOR,
+        HOST,
+        HOST_PORT_SEPARATOR,
+        PORT,
+        ADDRESS_END,
+        ADDRESS_SEPERATOR,
+        QPID_URL_END,
+        ERROR
+    }
+
+    //-- Constructors
+
+    private char[] _url;
+    private List<BrokerDetails> _brokerDetailList = new ArrayList<BrokerDetails>();
+    private String _error;
+    private int _index = 0;
+    private BrokerDetails _currentBroker;
+    private String _currentPropName;
+    private boolean _endOfURL = false;
+    private URLParserState _currentParserState;
+
+    public QpidURLImpl(String url) throws MalformedURLException
+    {
+        _url = url.toCharArray();
+        _endOfURL = false;
+        _currentParserState = URLParserState.QPID_URL_START;
+        URLParserState prevState = _currentParserState; // for error handling        
+        try
+        {
+            while (_currentParserState != URLParserState.ERROR && _currentParserState != URLParserState.QPID_URL_END)
+            {
+                prevState = _currentParserState;
+                _currentParserState = next();
+            }
+
+            if (_currentParserState == URLParserState.ERROR)
+            {
+                _error =
+                        "Invalid URL format [current_state = " + prevState + ", broker details parsed so far " + _currentBroker + " ] error at (" + _index + ") due to " + _error;
+                MalformedURLException ex;
+                ex = new MalformedURLException(_error);
+                throw ex;
+            }
+        }
+        catch (ArrayIndexOutOfBoundsException e)
+        {
+            e.printStackTrace();
+            _error =
+                    "Invalid URL format [current_state = " + prevState + ", broker details parsed so far " + _currentBroker + " ] error at (" + _index + ")";
+            MalformedURLException ex;
+            ex = new MalformedURLException(_error);
+            throw ex;
+        }
+    }
+
+    //-- interface QpidURL
+    public List<BrokerDetails> getAllBrokerDetails()
+    {
+        return _brokerDetailList;
+    }
+
+    public String getURL()
+    {
+        return new String(_url);
+    }
+
+    private URLParserState next()
+    {
+        switch (_currentParserState)
+        {
+            case QPID_URL_START:
+                return checkSequence(URL_START_SEQ, URLParserState.ADDRESS_START);
+            case ADDRESS_START:
+                return startAddress();
+            case PROPERTY_NAME:
+                return extractPropertyName();
+            case PROPERTY_EQUALS:
+                _index++; // skip the equal sign
+                return URLParserState.PROPERTY_VALUE;
+            case PROPERTY_VALUE:
+                return extractPropertyValue();
+            case PROPERTY_SEPARATOR:
+                _index++; // skip ","
+                return URLParserState.PROPERTY_NAME;
+            case AT_CHAR:
+                _index++; // skip the @ sign
+                return setProperties();
+                // case CLIENT_ID:
+                //     return extractClientId();
+                //  case CLIENT_ID_TRANSPORT_SEPARATOR:
+                //      _index++; // skip ":"
+                //      return URLParserState.TRANSPORT;
+            case TRANSPORT:
+                return extractTransport();
+            case TRANSPORT_HOST_SEPARATOR:
+                _index++; // skip ":"
+                return URLParserState.HOST;
+            case HOST:
+                return extractHost();
+            case HOST_PORT_SEPARATOR:
+                _index++; // skip ":"
+                return URLParserState.PORT;
+            case PORT:
+                return extractPort();
+            case ADDRESS_END:
+                return endAddress();
+            case ADDRESS_SEPERATOR:
+                _index++; // skip ","
+                return URLParserState.ADDRESS_START;
+            default:
+                return URLParserState.ERROR;
+        }
+    }
+
+    private URLParserState checkSequence(char[] expected, URLParserState nextPart)
+    {
+        for (char anExpected : expected)
+        {
+            if (anExpected != _url[_index])
+            {
+                _error = "Excepted (" + anExpected + ") at position " + _index + ", got (" + _url[_index] + ")";
+                return URLParserState.ERROR;
+            }
+            _index++;
+        }
+        return nextPart;
+    }
+
+    private URLParserState startAddress()
+    {
+        _currentBroker = new BrokerDetailsImpl();
+        // check that there is a "@" before the nexte ","
+        for (int j = _index; j < _url.length; j++)
+        {
+            if (_url[j] == AT_CHAR)
+            {
+                return URLParserState.PROPERTY_NAME;
+            }
+            else if (_url[j] == ADDRESS_SEPERATOR_CHAR)
+            {
+                return URLParserState.TRANSPORT;
+            }
+        }
+        return URLParserState.TRANSPORT;
+    }
+
+    private URLParserState endAddress()
+    {
+        _brokerDetailList.add(_currentBroker);
+        if (_endOfURL)
+        {
+            return URLParserState.QPID_URL_END;
+        }
+        else
+        {
+            return URLParserState.ADDRESS_SEPERATOR;
+        }
+    }
+
+    private URLParserState extractPropertyName()
+    {
+        StringBuilder b = new StringBuilder();
+        char next = _url[_index];
+        while (next != PROPERTY_EQUALS_CHAR && next != AT_CHAR)
+        {
+            b.append(next);
+            next = _url[++_index];
+        }
+        _currentPropName = b.toString();
+        if (_currentPropName.trim().equals(""))
+        {
+            _error = "Property name cannot be empty";
+            return URLParserState.ERROR;
+        }
+        else if (next == PROPERTY_EQUALS_CHAR)
+        {
+            return URLParserState.PROPERTY_EQUALS;
+        }
+        else
+        {
+            return URLParserState.AT_CHAR;
+        }
+    }
+
+    private URLParserState extractPropertyValue()
+    {
+        StringBuilder b = new StringBuilder();
+        char next = _url[_index];
+        while (next != PROPERTY_SEPARATOR_CHAR && next != AT_CHAR)
+        {
+            b.append(next);
+            next = _url[++_index];
+        }
+        String propValue = b.toString();
+        if (propValue.trim().equals(""))
+        {
+            _error = "Property values cannot be empty";
+            return URLParserState.ERROR;
+        }
+        else
+        {
+            _currentBroker.setProperty(_currentPropName, propValue);
+            if (next == PROPERTY_SEPARATOR_CHAR)
+            {
+                return URLParserState.PROPERTY_SEPARATOR;
+            }
+            else
+            {
+                return URLParserState.AT_CHAR;
+            }
+        }
+    }
+
+    private URLParserState setProperties()
+    {
+        //Check if atleast virtualhost is there
+        if (_currentBroker.getProperties().get(BrokerDetails.VIRTUAL_HOST) != null)
+        {
+            _currentBroker.setVirtualHost(_currentBroker.getProperties().get(BrokerDetails.VIRTUAL_HOST));
+            _currentBroker.getProperties().remove(BrokerDetails.VIRTUAL_HOST);
+        }
+
+        if (_currentBroker.getProperties().get(BrokerDetails.USERNAME) != null)
+        {
+            String username = _currentBroker.getProperties().get(BrokerDetails.USERNAME);
+            _currentBroker.setUserName(username);
+        }
+        if (_currentBroker.getProperties().get(BrokerDetails.PASSWORD) != null)
+        {
+            String password = _currentBroker.getProperties().get(BrokerDetails.PASSWORD);
+            _currentBroker.setPassword(password);
+        }
+        if (_currentBroker.getProperties().get(BrokerDetails.CLIENT_ID) != null)
+        {
+            String clientID = _currentBroker.getProperties().get(BrokerDetails.CLIENT_ID);
+            _currentBroker.setProperty(BrokerDetails.CLIENT_ID, clientID);
+        }
+        return URLParserState.TRANSPORT;
+    }
+
+    private URLParserState extractTransport()
+    {
+        String transport = buildUntil(TRANSPORT_HOST_SEPARATOR_CHAR);
+        if (transport.trim().equals(""))
+        {
+            _error = "Transport cannot be empty";
+            return URLParserState.ERROR;
+        }
+        else if (!(transport.trim().equals(BrokerDetails.PROTOCOL_TCP) || transport.trim()
+                .equals(BrokerDetails.PROTOCOL_TLS)))
+        {
+            _error = "Transport cannot be " + transport + " value must be tcp or tls";
+            return URLParserState.ERROR;
+        }
+        else
+        {
+            _currentBroker.setProtocol(transport);
+            return URLParserState.TRANSPORT_HOST_SEPARATOR;
+        }
+    }
+
+    private URLParserState extractHost()
+    {
+        char nextSep = 'c';
+        String host;
+        for (int i = _index; i < _url.length; i++)
+        {
+            if (_url[i] == HOST_PORT_SEPARATOR_CHAR)
+            {
+                nextSep = HOST_PORT_SEPARATOR_CHAR;
+                break;
+            }
+            else if (_url[i] == ADDRESS_SEPERATOR_CHAR)
+            {
+                nextSep = ADDRESS_SEPERATOR_CHAR;
+                break;
+            }
+        }
+        if (nextSep == HOST_PORT_SEPARATOR_CHAR)
+        {
+            host = buildUntil(HOST_PORT_SEPARATOR_CHAR);
+            if (host.trim().equals(""))
+            {
+                _error = "Host cannot be empty";
+                return URLParserState.ERROR;
+            }
+            else
+            {
+                _currentBroker.setHost(host);
+                return URLParserState.HOST_PORT_SEPARATOR;
+            }
+        }
+        else if (nextSep == ADDRESS_SEPERATOR_CHAR)
+        {
+            host = buildUntil(ADDRESS_SEPERATOR_CHAR);
+            if (host.trim().equals(""))
+            {
+                _error = "Host cannot be empty";
+                return URLParserState.ERROR;
+            }
+            else
+            {
+                _currentBroker.setHost(host);
+                return URLParserState.ADDRESS_END;
+            }
+        }
+        else
+        {
+            host = String.copyValueOf(_url, _index, _url.length - _index);
+            _currentBroker.setHost(host);
+            _endOfURL = true;
+            return URLParserState.ADDRESS_END;
+        }
+    }
+
+
+    private URLParserState extractPort()
+    {
+
+        StringBuilder b = new StringBuilder();
+        try
+        {
+            char next = _url[_index];
+            while (next != ADDRESS_SEPERATOR_CHAR)
+            {
+                b.append(next);
+                next = _url[++_index];
+            }
+        }
+        catch (ArrayIndexOutOfBoundsException e)
+        {
+            _endOfURL = true;
+        }
+        String portStr = b.toString();
+        if (portStr.trim().equals(""))
+        {
+            _error = "Host cannot be empty";
+            return URLParserState.ERROR;
+        }
+        else
+        {
+            try
+            {
+                int port = Integer.parseInt(portStr);
+                _currentBroker.setPort(port);
+                return URLParserState.ADDRESS_END;
+            }
+            catch (NumberFormatException e)
+            {
+                _error = "Illegal number for port";
+                return URLParserState.ERROR;
+            }
+        }
+    }
+
+    private String buildUntil(char c)
+    {
+        StringBuilder b = new StringBuilder();
+        char next = _url[_index];
+        while (next != c)
+        {
+            b.append(next);
+            next = _url[++_index];
+        }
+        return b.toString();
+    }
+
+    public static void main(String[] args)
+    {
+        String testurl = "qpid:password=pass;username=name@tcp:test1,tcp:fooBroker,keystore=/usr/foo@tls:tlsBroker";
+        try
+        {
+            QpidURLImpl impl = new QpidURLImpl(testurl);
+            for (BrokerDetails d : impl.getAllBrokerDetails())
+            {
+                System.out.println(d);
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/java/common/src/main/java/org/apache/qpidity/url/BindingURL.java b/java/common/src/main/java/org/apache/qpidity/url/BindingURL.java
deleted file mode 100644
index a795b05b22..0000000000
--- a/java/common/src/main/java/org/apache/qpidity/url/BindingURL.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.qpidity.url;
-
-import org.apache.qpid.framing.AMQShortString;
-
-/*
-    Binding URL format:
-    <exch_class>://<exch_name>/[<destination>]/[<queue>]?<option>='<value>'[,<option>='<value>']*
-*/
-public interface BindingURL
-{
-    public static final String OPTION_EXCLUSIVE = "exclusive";
-    public static final String OPTION_AUTODELETE = "autodelete";
-    public static final String OPTION_DURABLE = "durable";
-    public static final String OPTION_CLIENTID = "clientid";
-    public static final String OPTION_SUBSCRIPTION = "subscription";
-    public static final String OPTION_ROUTING_KEY = "routingkey";
-
-
-    String getURL();
-
-   String getExchangeClass();
-
-    String getExchangeName();
-
-    String getDestinationName();
-
-    String getQueueName();
-
-    String getOption(String key);
-
-    boolean containsOption(String key);
-
-    String getRoutingKey();
-
-    String toString();
-}
diff --git a/java/common/src/main/java/org/apache/qpidity/url/BindingURLImpl.java b/java/common/src/main/java/org/apache/qpidity/url/BindingURLImpl.java
deleted file mode 100644
index 427e0f1413..0000000000
--- a/java/common/src/main/java/org/apache/qpidity/url/BindingURLImpl.java
+++ /dev/null
@@ -1,261 +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.qpidity.url;
-
-import org.apache.qpidity.exchange.ExchangeDefaults;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-
-import java.util.HashMap;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-public class BindingURLImpl implements BindingURL
-{
-    private static final Logger _logger = LoggerFactory.getLogger(BindingURLImpl.class);
-
-    String _url;
-    String _exchangeClass;
-    String _exchangeName;
-    String _destinationName;
-    String _queueName;
-    private HashMap<String, String> _options;
-
-    public BindingURLImpl(String url) throws URLSyntaxException
-    {
-        // format:
-        // <exch_class>://<exch_name>/[<destination>]/[<queue>]?<option>='<value>'[,<option>='<value>']*
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug("Parsing URL: " + url);
-        }
-        _url = url;
-        _options = new HashMap<String, String>();
-        parseBindingURL();
-    }
-
-    private void parseBindingURL() throws URLSyntaxException
-    {
-        try
-        {
-            URI connection = new URI(_url);
-            String exchangeClass = connection.getScheme();
-            if (exchangeClass == null)
-            {
-                _url = ExchangeDefaults.DIRECT_EXCHANGE_CLASS + "://" + "" + "//" + _url;
-                // URLHelper.parseError(-1, "Exchange Class not specified.", _url);
-                parseBindingURL();
-                return;
-            }
-            else
-            {
-                setExchangeClass(exchangeClass);
-            }
-            String exchangeName = connection.getHost();
-            if (exchangeName == null)
-            {
-                if (getExchangeClass().equals(ExchangeDefaults.DIRECT_EXCHANGE_CLASS))
-                {
-                    setExchangeName("");
-                }
-                else
-                {
-                    throw URLHelper.parseError(-1, "Exchange Name not specified.", _url);
-                }
-            }
-            else
-            {
-                setExchangeName(exchangeName);
-            }
-            String queueName;
-            if ((connection.getPath() == null) || connection.getPath().equals(""))
-            {
-                throw URLHelper.parseError(_url.indexOf(_exchangeName) + _exchangeName.length(),
-                                           "Destination or Queue requried", _url);
-            }
-            else
-            {
-                int slash = connection.getPath().indexOf("/", 1);
-                if (slash == -1)
-                {
-                    throw URLHelper.parseError(_url.indexOf(_exchangeName) + _exchangeName.length(),
-                                               "Destination requried", _url);
-                }
-                else
-                {
-                    String path = connection.getPath();
-                    setDestinationName(path.substring(1, slash));
-
-                    // We don't set queueName yet as the actual value we use depends on options set
-                    // when we are dealing with durable subscriptions
-
-                    queueName = path.substring(slash + 1);
-
-                }
-            }
-
-            URLHelper.parseOptions(_options, connection.getQuery());
-            processOptions();
-            // We can now call setQueueName as the URL is full parsed.
-            setQueueName(queueName);
-            // Fragment is #string (not used)
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("URL Parsed: " + this);
-            }
-        }
-        catch (URISyntaxException uris)
-        {
-            throw URLHelper.parseError(uris.getIndex(), uris.getReason(), uris.getInput());
-        }
-    }
-
-
-    private void processOptions()
-    {
-        // this is where we would parse any options that needed more than just storage.
-    }
-
-    public String getURL()
-    {
-        return _url;
-    }
-
-    public String getExchangeClass()
-    {
-        return _exchangeClass;
-    }
-
-    private void setExchangeClass(String exchangeClass)
-    {
-
-        _exchangeClass = exchangeClass;
-        if (exchangeClass.equals(ExchangeDefaults.TOPIC_EXCHANGE_CLASS))
-        {
-            setOption(BindingURL.OPTION_EXCLUSIVE, "true");
-        }
-
-    }
-
-    public String getExchangeName()
-    {
-        return _exchangeName;
-    }
-
-    private void setExchangeName(String name)
-    {
-        _exchangeName = name;
-    }
-
-    public String getDestinationName()
-    {
-        return _destinationName;
-    }
-
-    private void setDestinationName(String name)
-    {
-        _destinationName = name;
-    }
-
-    public String getQueueName()
-    {
-        return _queueName;
-    }
-
-    public void setQueueName(String name) throws URLSyntaxException
-    {
-        if (_exchangeClass.equals(ExchangeDefaults.TOPIC_EXCHANGE_CLASS))
-        {
-            if (Boolean.parseBoolean(getOption(OPTION_DURABLE)))
-            {
-                if (containsOption(BindingURL.OPTION_CLIENTID) && containsOption(BindingURL.OPTION_SUBSCRIPTION))
-                {
-                    _queueName = getOption(BindingURL.OPTION_CLIENTID + ":" + BindingURL.OPTION_SUBSCRIPTION);
-                }
-                else
-                {
-                    throw URLHelper.parseError(-1,
-                                               "Durable subscription must have values for " + BindingURL.OPTION_CLIENTID + " and " + BindingURL.OPTION_SUBSCRIPTION + ".",
-                                               _url);
-
-                }
-            }
-            else
-            {
-                _queueName = null;
-            }
-        }
-        else
-        {
-            _queueName = name;
-        }
-
-    }
-
-    public String getOption(String key)
-    {
-        return _options.get(key);
-    }
-
-    public void setOption(String key, String value)
-    {
-        _options.put(key, value);
-    }
-
-    public boolean containsOption(String key)
-    {
-        return _options.containsKey(key);
-    }
-
-    public String getRoutingKey()
-    {
-        if (_exchangeClass.equals(ExchangeDefaults.DIRECT_EXCHANGE_CLASS))
-        {
-            return getQueueName();
-        }
-
-        if (containsOption(BindingURL.OPTION_ROUTING_KEY))
-        {
-            return getOption(OPTION_ROUTING_KEY);
-        }
-
-        return getDestinationName();
-    }
-
-    public void setRoutingKey(String key)
-    {
-        setOption(OPTION_ROUTING_KEY, key);
-    }
-
-    public String toString()
-    {
-        StringBuffer sb = new StringBuffer();
-
-        sb.append(_exchangeClass);
-        sb.append("://");
-        sb.append(_exchangeName);
-        sb.append('/');
-        sb.append(_destinationName);
-        sb.append('/');
-        sb.append(_queueName);
-
-        sb.append(URLHelper.printOptions(_options));
-
-        return sb.toString();
-    }
-}
diff --git a/java/common/src/main/java/org/apache/qpidity/url/QpidURL.java b/java/common/src/main/java/org/apache/qpidity/url/QpidURL.java
deleted file mode 100644
index 579c13a4eb..0000000000
--- a/java/common/src/main/java/org/apache/qpidity/url/QpidURL.java
+++ /dev/null
@@ -1,57 +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.qpidity.url;
-
-import org.apache.qpidity.BrokerDetails;
-
-import java.util.List;
-
-/**
- * The format of the Qpid URL is based on the AMQP one.
- * The grammar is as follows:
- * <p> qpid_url          = "qpid:" [user_props] prot_addr_list ["/" future-parameters]
- * <p> prot_addr_list 	 = [prot_addr ","]* prot_addr
- * <p> prot_addr         = tcp_prot_addr | tls_prot_addr | future_prot_addr
- * <p> tcp_prot_addr     = tcp_id tcp_addr
- * <p> tcp_id            = "tcp:" | ""
- * <p> tcp_addr          = [host [":" port] ]
- * <p> host              = <as per [2]>
- * <p> port              = number
- * <p> tls_prot_addr     = tls_id tls_addr
- * <p> tls_id            = "tls:" | ""
- * <p> tls_addr          = [host [":" port] ]
- * <p> future_prot_addr  = future_prot_id future_prot_addr
- * <p> future_prot_id    = <placeholder, must end in ":". Example "sctp:">
- * <p> future_prot_addr  = <placeholder, protocl-specific address>
- * <p> future_parameters = <placeholder, not used in failover addresses>
- */
-public interface QpidURL
-{
-    /**
-     * Get all the broker details
-     *
-     * @return A list of BrokerDetails.
-     */
-    public List<BrokerDetails> getAllBrokerDetails();
-
-    /**
-     * Get this URL string form
-     * @return This URL string form.
-     */
-    public String getURL();
-}
diff --git a/java/common/src/main/java/org/apache/qpidity/url/QpidURLImpl.java b/java/common/src/main/java/org/apache/qpidity/url/QpidURLImpl.java
deleted file mode 100644
index 20d5730d4f..0000000000
--- a/java/common/src/main/java/org/apache/qpidity/url/QpidURLImpl.java
+++ /dev/null
@@ -1,460 +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.qpidity.url;
-
-import org.apache.qpidity.BrokerDetails;
-import org.apache.qpidity.BrokerDetailsImpl;
-
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * The format Qpid URL is based on the AMQP one.
- * The grammar is as follows:
- * <p> qpid_url          = "qpid:" [client_props "@"] port_addr_list ["/" future-parameters]
- * <p> port_addr_list 	 = [port_addr ","]* port_addr
- * <p> port_addr         = tcp_port_addr | tls_prot_addr | future_prot_addr
- * <p> tcp_port_addr     = tcp_id tcp_addr
- * <p> tcp_id            = "tcp:" | ""
- * <p> tcp_addr          = host [":" port]
- * <p> host              = <as per http://www.apps.ietf.org/>
- * <p> port              = number
- * <p> tls_prot_addr     = tls_id tls_addr
- * <p> tls_id            = "tls:" | ""
- * <p> tls_addr          = host [":" port]
- * <p> future_prot_addr  = future_prot_id future_prot_addr
- * <p> future_prot_id    = <placeholder, must end in ":". Example "sctp:">
- * <p> future_prot_addr  = <placeholder, protocl-specific address>
- * <p> future_parameters = <placeholder, not used in failover addresses>
- * <p> client_props      = [client_prop ";"]*  client_prop
- * <p> client_prop       = prop "=" val
- * <p> prop              = chars as per <as per http://www.apps.ietf.org/>
- * <p> val               = valid as per <as per http://www.apps.ietf.org/>
- * <p/>
- * Ex: qpid:virtualhost=tcp:host-foo,test,client_id=foo@tcp:myhost.com:5672,virtualhost=prod;
- * keystore=/opt/keystore@client_id2@tls:mysecurehost.com:5672
- */
-public class QpidURLImpl implements QpidURL
-{
-    private static final char[] URL_START_SEQ = new char[]{'q', 'p', 'i', 'd', ':'};
-    private static final char PROPERTY_EQUALS_CHAR = '=';
-    private static final char PROPERTY_SEPARATOR_CHAR = ';';
-    private static final char ADDRESS_SEPERATOR_CHAR = ',';
-
-    //private static final char CLIENT_ID_TRANSPORT_SEPARATOR_CHAR = ':';
-    private static final char TRANSPORT_HOST_SEPARATOR_CHAR = ':';
-    private static final char HOST_PORT_SEPARATOR_CHAR = ':';
-    private static final char AT_CHAR = '@';
-
-    enum URLParserState
-    {
-        QPID_URL_START,
-        ADDRESS_START,
-        PROPERTY_NAME,
-        PROPERTY_EQUALS,
-        PROPERTY_VALUE,
-        PROPERTY_SEPARATOR,
-        AT_CHAR,
-        //   CLIENT_ID,
-        //   CLIENT_ID_TRANSPORT_SEPARATOR,
-        TRANSPORT,
-        TRANSPORT_HOST_SEPARATOR,
-        HOST,
-        HOST_PORT_SEPARATOR,
-        PORT,
-        ADDRESS_END,
-        ADDRESS_SEPERATOR,
-        QPID_URL_END,
-        ERROR
-    }
-
-    //-- Constructors
-
-    private char[] _url;
-    private List<BrokerDetails> _brokerDetailList = new ArrayList<BrokerDetails>();
-    private String _error;
-    private int _index = 0;
-    private BrokerDetails _currentBroker;
-    private String _currentPropName;
-    private boolean _endOfURL = false;
-    private URLParserState _currentParserState;
-
-    public QpidURLImpl(String url) throws MalformedURLException
-    {
-        _url = url.toCharArray();
-        _endOfURL = false;
-        _currentParserState = URLParserState.QPID_URL_START;
-        URLParserState prevState = _currentParserState; // for error handling        
-        try
-        {
-            while (_currentParserState != URLParserState.ERROR && _currentParserState != URLParserState.QPID_URL_END)
-            {
-                prevState = _currentParserState;
-                _currentParserState = next();
-            }
-
-            if (_currentParserState == URLParserState.ERROR)
-            {
-                _error =
-                        "Invalid URL format [current_state = " + prevState + ", broker details parsed so far " + _currentBroker + " ] error at (" + _index + ") due to " + _error;
-                MalformedURLException ex;
-                ex = new MalformedURLException(_error);
-                throw ex;
-            }
-        }
-        catch (ArrayIndexOutOfBoundsException e)
-        {
-            e.printStackTrace();
-            _error =
-                    "Invalid URL format [current_state = " + prevState + ", broker details parsed so far " + _currentBroker + " ] error at (" + _index + ")";
-            MalformedURLException ex;
-            ex = new MalformedURLException(_error);
-            throw ex;
-        }
-    }
-
-    //-- interface QpidURL
-    public List<BrokerDetails> getAllBrokerDetails()
-    {
-        return _brokerDetailList;
-    }
-
-    public String getURL()
-    {
-        return new String(_url);
-    }
-
-    private URLParserState next()
-    {
-        switch (_currentParserState)
-        {
-            case QPID_URL_START:
-                return checkSequence(URL_START_SEQ, URLParserState.ADDRESS_START);
-            case ADDRESS_START:
-                return startAddress();
-            case PROPERTY_NAME:
-                return extractPropertyName();
-            case PROPERTY_EQUALS:
-                _index++; // skip the equal sign
-                return URLParserState.PROPERTY_VALUE;
-            case PROPERTY_VALUE:
-                return extractPropertyValue();
-            case PROPERTY_SEPARATOR:
-                _index++; // skip ","
-                return URLParserState.PROPERTY_NAME;
-            case AT_CHAR:
-                _index++; // skip the @ sign
-                return setProperties();
-                // case CLIENT_ID:
-                //     return extractClientId();
-                //  case CLIENT_ID_TRANSPORT_SEPARATOR:
-                //      _index++; // skip ":"
-                //      return URLParserState.TRANSPORT;
-            case TRANSPORT:
-                return extractTransport();
-            case TRANSPORT_HOST_SEPARATOR:
-                _index++; // skip ":"
-                return URLParserState.HOST;
-            case HOST:
-                return extractHost();
-            case HOST_PORT_SEPARATOR:
-                _index++; // skip ":"
-                return URLParserState.PORT;
-            case PORT:
-                return extractPort();
-            case ADDRESS_END:
-                return endAddress();
-            case ADDRESS_SEPERATOR:
-                _index++; // skip ","
-                return URLParserState.ADDRESS_START;
-            default:
-                return URLParserState.ERROR;
-        }
-    }
-
-    private URLParserState checkSequence(char[] expected, URLParserState nextPart)
-    {
-        for (char anExpected : expected)
-        {
-            if (anExpected != _url[_index])
-            {
-                _error = "Excepted (" + anExpected + ") at position " + _index + ", got (" + _url[_index] + ")";
-                return URLParserState.ERROR;
-            }
-            _index++;
-        }
-        return nextPart;
-    }
-
-    private URLParserState startAddress()
-    {
-        _currentBroker = new BrokerDetailsImpl();
-        // check that there is a "@" before the nexte ","
-        for (int j = _index; j < _url.length; j++)
-        {
-            if (_url[j] == AT_CHAR)
-            {
-                return URLParserState.PROPERTY_NAME;
-            }
-            else if (_url[j] == ADDRESS_SEPERATOR_CHAR)
-            {
-                return URLParserState.TRANSPORT;
-            }
-        }
-        return URLParserState.TRANSPORT;
-    }
-
-    private URLParserState endAddress()
-    {
-        _brokerDetailList.add(_currentBroker);
-        if (_endOfURL)
-        {
-            return URLParserState.QPID_URL_END;
-        }
-        else
-        {
-            return URLParserState.ADDRESS_SEPERATOR;
-        }
-    }
-
-    private URLParserState extractPropertyName()
-    {
-        StringBuilder b = new StringBuilder();
-        char next = _url[_index];
-        while (next != PROPERTY_EQUALS_CHAR && next != AT_CHAR)
-        {
-            b.append(next);
-            next = _url[++_index];
-        }
-        _currentPropName = b.toString();
-        if (_currentPropName.trim().equals(""))
-        {
-            _error = "Property name cannot be empty";
-            return URLParserState.ERROR;
-        }
-        else if (next == PROPERTY_EQUALS_CHAR)
-        {
-            return URLParserState.PROPERTY_EQUALS;
-        }
-        else
-        {
-            return URLParserState.AT_CHAR;
-        }
-    }
-
-    private URLParserState extractPropertyValue()
-    {
-        StringBuilder b = new StringBuilder();
-        char next = _url[_index];
-        while (next != PROPERTY_SEPARATOR_CHAR && next != AT_CHAR)
-        {
-            b.append(next);
-            next = _url[++_index];
-        }
-        String propValue = b.toString();
-        if (propValue.trim().equals(""))
-        {
-            _error = "Property values cannot be empty";
-            return URLParserState.ERROR;
-        }
-        else
-        {
-            _currentBroker.setProperty(_currentPropName, propValue);
-            if (next == PROPERTY_SEPARATOR_CHAR)
-            {
-                return URLParserState.PROPERTY_SEPARATOR;
-            }
-            else
-            {
-                return URLParserState.AT_CHAR;
-            }
-        }
-    }
-
-    private URLParserState setProperties()
-    {
-        //Check if atleast virtualhost is there
-        if (_currentBroker.getProperties().get(BrokerDetails.VIRTUAL_HOST) != null)
-        {
-            _currentBroker.setVirtualHost(_currentBroker.getProperties().get(BrokerDetails.VIRTUAL_HOST));
-            _currentBroker.getProperties().remove(BrokerDetails.VIRTUAL_HOST);
-        }
-
-        if (_currentBroker.getProperties().get(BrokerDetails.USERNAME) != null)
-        {
-            String username = _currentBroker.getProperties().get(BrokerDetails.USERNAME);
-            _currentBroker.setUserName(username);
-        }
-        if (_currentBroker.getProperties().get(BrokerDetails.PASSWORD) != null)
-        {
-            String password = _currentBroker.getProperties().get(BrokerDetails.PASSWORD);
-            _currentBroker.setPassword(password);
-        }
-        if (_currentBroker.getProperties().get(BrokerDetails.CLIENT_ID) != null)
-        {
-            String clientID = _currentBroker.getProperties().get(BrokerDetails.CLIENT_ID);
-            _currentBroker.setProperty(BrokerDetails.CLIENT_ID, clientID);
-        }
-        return URLParserState.TRANSPORT;
-    }
-
-    private URLParserState extractTransport()
-    {
-        String transport = buildUntil(TRANSPORT_HOST_SEPARATOR_CHAR);
-        if (transport.trim().equals(""))
-        {
-            _error = "Transport cannot be empty";
-            return URLParserState.ERROR;
-        }
-        else if (!(transport.trim().equals(BrokerDetails.PROTOCOL_TCP) || transport.trim()
-                .equals(BrokerDetails.PROTOCOL_TLS)))
-        {
-            _error = "Transport cannot be " + transport + " value must be tcp or tls";
-            return URLParserState.ERROR;
-        }
-        else
-        {
-            _currentBroker.setProtocol(transport);
-            return URLParserState.TRANSPORT_HOST_SEPARATOR;
-        }
-    }
-
-    private URLParserState extractHost()
-    {
-        char nextSep = 'c';
-        String host;
-        for (int i = _index; i < _url.length; i++)
-        {
-            if (_url[i] == HOST_PORT_SEPARATOR_CHAR)
-            {
-                nextSep = HOST_PORT_SEPARATOR_CHAR;
-                break;
-            }
-            else if (_url[i] == ADDRESS_SEPERATOR_CHAR)
-            {
-                nextSep = ADDRESS_SEPERATOR_CHAR;
-                break;
-            }
-        }
-        if (nextSep == HOST_PORT_SEPARATOR_CHAR)
-        {
-            host = buildUntil(HOST_PORT_SEPARATOR_CHAR);
-            if (host.trim().equals(""))
-            {
-                _error = "Host cannot be empty";
-                return URLParserState.ERROR;
-            }
-            else
-            {
-                _currentBroker.setHost(host);
-                return URLParserState.HOST_PORT_SEPARATOR;
-            }
-        }
-        else if (nextSep == ADDRESS_SEPERATOR_CHAR)
-        {
-            host = buildUntil(ADDRESS_SEPERATOR_CHAR);
-            if (host.trim().equals(""))
-            {
-                _error = "Host cannot be empty";
-                return URLParserState.ERROR;
-            }
-            else
-            {
-                _currentBroker.setHost(host);
-                return URLParserState.ADDRESS_END;
-            }
-        }
-        else
-        {
-            host = String.copyValueOf(_url, _index, _url.length - _index);
-            _currentBroker.setHost(host);
-            _endOfURL = true;
-            return URLParserState.ADDRESS_END;
-        }
-    }
-
-
-    private URLParserState extractPort()
-    {
-
-        StringBuilder b = new StringBuilder();
-        try
-        {
-            char next = _url[_index];
-            while (next != ADDRESS_SEPERATOR_CHAR)
-            {
-                b.append(next);
-                next = _url[++_index];
-            }
-        }
-        catch (ArrayIndexOutOfBoundsException e)
-        {
-            _endOfURL = true;
-        }
-        String portStr = b.toString();
-        if (portStr.trim().equals(""))
-        {
-            _error = "Host cannot be empty";
-            return URLParserState.ERROR;
-        }
-        else
-        {
-            try
-            {
-                int port = Integer.parseInt(portStr);
-                _currentBroker.setPort(port);
-                return URLParserState.ADDRESS_END;
-            }
-            catch (NumberFormatException e)
-            {
-                _error = "Illegal number for port";
-                return URLParserState.ERROR;
-            }
-        }
-    }
-
-    private String buildUntil(char c)
-    {
-        StringBuilder b = new StringBuilder();
-        char next = _url[_index];
-        while (next != c)
-        {
-            b.append(next);
-            next = _url[++_index];
-        }
-        return b.toString();
-    }
-
-    public static void main(String[] args)
-    {
-        String testurl = "qpid:password=pass;username=name@tcp:test1,tcp:fooBroker,keystore=/usr/foo@tls:tlsBroker";
-        try
-        {
-            QpidURLImpl impl = new QpidURLImpl(testurl);
-            for (BrokerDetails d : impl.getAllBrokerDetails())
-            {
-                System.out.println(d);
-            }
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/java/common/src/main/java/org/apache/qpidity/url/URLHelper.java b/java/common/src/main/java/org/apache/qpidity/url/URLHelper.java
deleted file mode 100644
index eba1b0bbeb..0000000000
--- a/java/common/src/main/java/org/apache/qpidity/url/URLHelper.java
+++ /dev/null
@@ -1,169 +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.qpidity.url;
-
-import java.util.HashMap;
-
-public class URLHelper
-{
-    public static char DEFAULT_OPTION_SEPERATOR = '&';
-    public static char ALTERNATIVE_OPTION_SEPARATOR = ',';
-    public static char BROKER_SEPARATOR = ';';
-
-    public static void parseOptions(HashMap<String, String> optionMap, String options) throws URLSyntaxException
-    {
-        // options looks like this
-        // brokerlist='tcp://host:port?option='value',option='value';vm://:3/virtualpath?option='value'',failover='method?option='value',option='value''
-
-        if ((options == null) || (options.indexOf('=') == -1))
-        {
-            return;
-        }
-
-        int optionIndex = options.indexOf('=');
-
-        String option = options.substring(0, optionIndex);
-
-        int length = options.length();
-
-        int nestedQuotes = 0;
-
-        // to store index of final "'"
-        int valueIndex = optionIndex;
-
-        // Walk remainder of url.
-        while ((nestedQuotes > 0) || (valueIndex < length))
-        {
-            valueIndex++;
-
-            if (valueIndex >= length)
-            {
-                break;
-            }
-
-            if (options.charAt(valueIndex) == '\'')
-            {
-                if ((valueIndex + 1) < options.length())
-                {
-                    if ((options.charAt(valueIndex + 1) == DEFAULT_OPTION_SEPERATOR)
-                            || (options.charAt(valueIndex + 1) == ALTERNATIVE_OPTION_SEPARATOR)
-                            || (options.charAt(valueIndex + 1) == BROKER_SEPARATOR)
-                            || (options.charAt(valueIndex + 1) == '\''))
-                    {
-                        nestedQuotes--;
-
-                        if (nestedQuotes == 0)
-                        {
-                            // We've found the value of an option
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        nestedQuotes++;
-                    }
-                }
-                else
-                {
-                    // We are at the end of the string
-                    // Check to see if we are corectly closing quotes
-                    if (options.charAt(valueIndex) == '\'')
-                    {
-                        nestedQuotes--;
-                    }
-
-                    break;
-                }
-            }
-        }
-
-        if ((nestedQuotes != 0) || (valueIndex < (optionIndex + 2)))
-        {
-            int sepIndex = 0;
-
-            // Try and identify illegal separator character
-            if (nestedQuotes > 1)
-            {
-                for (int i = 0; i < nestedQuotes; i++)
-                {
-                    sepIndex = options.indexOf('\'', sepIndex);
-                    sepIndex++;
-                }
-            }
-
-            if ((sepIndex >= options.length()) || (sepIndex == 0))
-            {
-                throw parseError(valueIndex, "Unterminated option", options);
-            }
-            else
-            {
-                throw parseError(sepIndex, "Unterminated option. Possible illegal option separator:'"
-                    + options.charAt(sepIndex) + "'", options);
-            }
-        }
-
-        // optionIndex +2 to skip "='"
-        String value = options.substring(optionIndex + 2, valueIndex);
-
-        optionMap.put(option, value);
-
-        if (valueIndex < (options.length() - 1))
-        {
-            // Recurse to get remaining options
-            parseOptions(optionMap, options.substring(valueIndex + 2));
-        }
-    }
-
-    public static URLSyntaxException parseError(int index, String error, String url)
-    {
-        return parseError(index, 1, error, url);
-    }
-
-    public static URLSyntaxException parseError(int index, int length, String error, String url)
-    {
-        return new URLSyntaxException(url, error, index, length);
-    }
-
-    public static String printOptions(HashMap<String, String> options)
-    {
-        if (options.isEmpty())
-        {
-            return "";
-        }
-        else
-        {
-            StringBuffer sb = new StringBuffer();
-            sb.append('?');
-            for (String key : options.keySet())
-            {
-                sb.append(key);
-
-                sb.append("='");
-
-                sb.append(options.get(key));
-
-                sb.append("'");
-                sb.append(DEFAULT_OPTION_SEPERATOR);
-            }
-
-            sb.deleteCharAt(sb.length() - 1);
-
-            return sb.toString();
-        }
-    }
-}
diff --git a/java/common/src/main/java/org/apache/qpidity/url/URLSyntaxException.java b/java/common/src/main/java/org/apache/qpidity/url/URLSyntaxException.java
deleted file mode 100644
index bc65b70d14..0000000000
--- a/java/common/src/main/java/org/apache/qpidity/url/URLSyntaxException.java
+++ /dev/null
@@ -1,94 +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.qpidity.url;
-
-import java.net.URISyntaxException;
-
-public class URLSyntaxException extends URISyntaxException
-{
-    private int _length;
-
-    public URLSyntaxException(String url, String error, int index, int length)
-    {
-        super(url, error, index);
-
-        _length = length;
-    }
-
-    private static String getPositionString(int index, int length)
-    {
-        StringBuffer sb = new StringBuffer(index + 1);
-
-        for (int i = 0; i < index; i++)
-        {
-            sb.append(" ");
-        }
-
-        if (length > -1)
-        {
-            for (int i = 0; i < length; i++)
-            {
-                sb.append('^');
-            }
-        }
-
-        return sb.toString();
-    }
-
-
-    public String toString()
-    {
-        StringBuffer sb = new StringBuffer();
-
-        sb.append(getReason());
-
-        if (getIndex() > -1)
-        {
-            if (_length != -1)
-            {
-                sb.append(" between indicies ");
-                sb.append(getIndex());
-                sb.append(" and ");
-                sb.append(_length);
-            }
-            else
-            {
-                sb.append(" at index ");
-                sb.append(getIndex());
-            }
-        }
-
-        sb.append(" ");
-        if (getIndex() != -1)
-        {
-            sb.append("\n");
-        }
-
-        sb.append(getInput());
-
-        if (getIndex() != -1)
-        {
-            sb.append("\n");
-            sb.append(getPositionString(getIndex(), _length));
-        }
-
-        return sb.toString();
-    }
-
-
-}
-- 
cgit v1.2.1