QPID-3343: refactor test profiles to allow testing within the same JVM for all protocols, remove vm:// transport support and associated forked Mina classes

Applied patch by Keith Wall and myself

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

9 files changed, 7 insertions, 306 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
index ed37a69b82..c8576bf00d 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
@@ -56,8 +56,7 @@ public class AMQBrokerDetails implements BrokerDetails
             if (transport != null)
             {
                 //todo this list of valid transports should be enumerated somewhere
-                if (!(transport.equalsIgnoreCase(BrokerDetails.VM) ||
-                       transport.equalsIgnoreCase(BrokerDetails.TCP)))
+                if (!(transport.equalsIgnoreCase(BrokerDetails.TCP)))
                 {
                     if (transport.equalsIgnoreCase("localhost"))
                     {
@@ -297,12 +296,7 @@ public class AMQBrokerDetails implements BrokerDetails
 
         sb.append(_transport);
         sb.append("://");
-
-        if (!(_transport.equalsIgnoreCase(VM)))
-        {
-            sb.append(_host);
-        }
-
+        sb.append(_host);
         sb.append(':');
         sb.append(_port);
 
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
index 94a55ef52c..5b6a986997 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
@@ -328,7 +328,7 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect
         
         _failoverPolicy = new FailoverPolicy(connectionURL, this);
         BrokerDetails brokerDetails = _failoverPolicy.getCurrentBrokerDetails();
-        if (brokerDetails.getTransport().equals(BrokerDetails.VM) || "0-8".equals(amqpVersion)) 
+        if ("0-8".equals(amqpVersion)) 
         {
             _delegate = new AMQConnectionDelegate_8_0(this);
         } 
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
index b0242210d8..a837975304 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
@@ -39,7 +39,6 @@ import org.apache.qpid.client.failover.FailoverRetrySupport;
 import org.apache.qpid.client.protocol.AMQProtocolSession;
 import org.apache.qpid.client.state.AMQState;
 import org.apache.qpid.client.state.StateWaiter;
-import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.framing.BasicQosBody;
 import org.apache.qpid.framing.BasicQosOkBody;
 import org.apache.qpid.framing.ChannelOpenBody;
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
index 93b4c51a8f..f9f50d9150 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
@@ -27,18 +27,14 @@ import java.util.Map;
 
 import org.apache.qpid.client.url.URLParser;
 import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ProtocolVersion;
 import org.apache.qpid.jms.BrokerDetails;
 import org.apache.qpid.jms.ConnectionURL;
 import org.apache.qpid.url.URLHelper;
 import org.apache.qpid.url.URLSyntaxException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class AMQConnectionURL implements ConnectionURL
 {
-    private static final Logger _logger = LoggerFactory.getLogger(AMQConnectionURL.class);
-
+ 
     private String _url;
     private String _failoverMethod;
     private Map<String, String> _failoverOptions;
@@ -295,17 +291,4 @@ public class AMQConnectionURL implements ConnectionURL
 
         return sb.toString();
     }
-
-    public static void main(String[] args) throws URLSyntaxException
-    {
-        String url2 =
-            "amqp://ritchiem:bob@temp/testHost?brokerlist='tcp://localhost:5672;tcp://fancyserver:3000/',failover='roundrobin'";
-        // "amqp://user:pass@clientid/virtualhost?brokerlist='tcp://host:1?option1=\'value\',option2=\'value\';vm://:3?option1=\'value\'',failover='method?option1=\'value\',option2='value''";
-
-        ConnectionURL connectionurl2 = new AMQConnectionURL(url2);
-
-        System.out.println(url2);
-        System.out.println(connectionurl2);
-
-    }
 }
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
deleted file mode 100644
index 3e03f88341..0000000000
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
+++ /dev/null
@@ -1,214 +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.client.transport;
-
-import java.io.IOException;
-import java.net.Socket;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoServiceConfig;
-import org.apache.mina.transport.vmpipe.VmPipeAcceptor;
-import org.apache.mina.transport.vmpipe.VmPipeAddress;
-import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
-import org.apache.qpid.protocol.ProtocolEngineFactory;
-import org.apache.qpid.transport.network.VMBrokerMap;
-import org.apache.qpid.transport.network.mina.MinaNetworkHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The TransportConnection is a helper class responsible for connecting to an AMQ server. It sets up the underlying
- * connector, which currently always uses TCP/IP sockets. It creates the "protocol handler" which deals with MINA
- * protocol events. <p/> Could be extended in future to support different transport types by turning this into concrete
- * class/interface combo.
- */
-public class TransportConnection
-{
-    private static ITransportConnection _instance;
-
-    private static VmPipeAcceptor _acceptor;
-    private static int _currentInstance = -1;
-    private static int _currentVMPort = -1;
-
-    private static Logger _logger = LoggerFactory.getLogger(TransportConnection.class);
-
-    private static final String DEFAULT_QPID_SERVER = "org.apache.qpid.server.protocol.AMQProtocolEngineFactory";
-
-    public static final int DEFAULT_VM_PORT = 1;
-
-    public static void createVMBroker(int port) throws AMQVMBrokerCreationException
-    {
-        synchronized(TransportConnection.class)
-        {
-            if (_acceptor == null)
-            {
-                _acceptor = new VmPipeAcceptor();
-
-                IoServiceConfig config = _acceptor.getDefaultConfig();
-            }
-        }
-        synchronized (VMBrokerMap.class)
-        {
-
-            if (!VMBrokerMap.contains(port))
-            {
-                _logger.info("Creating InVM Qpid.AMQP listening on port " + port);
-                IoHandlerAdapter provider = null;
-                try
-                {
-                    VmPipeAddress pipe = new VmPipeAddress(port);
-
-                    provider = createBrokerInstance(port);
-
-                    _acceptor.bind(pipe, provider);
-
-                    VMBrokerMap.add(port, pipe);
-                    _logger.info("Created InVM Qpid.AMQP listening on port " + port);
-                }
-                catch (IOException e)
-                {
-                    _logger.error("Got IOException.", e);
-
-                    // Try and unbind provider
-                    try
-                    {
-                        VmPipeAddress pipe = new VmPipeAddress(port);
-
-                        try
-                        {
-                            _acceptor.unbind(pipe);
-                        }
-                        catch (Exception ignore)
-                        {
-                            // ignore
-                        }
-
-                        if (provider == null)
-                        {
-                            provider = createBrokerInstance(port);
-                        }
-
-                        _acceptor.bind(pipe, provider);
-                        VMBrokerMap.add(port, pipe);
-                        _logger.info("Created InVM Qpid.AMQP listening on port " + port);
-                    }
-                    catch (IOException justUseFirstException)
-                    {
-                        String because;
-                        if (e.getCause() == null)
-                        {
-                            because = e.toString();
-                        }
-                        else
-                        {
-                            because = e.getCause().toString();
-                        }
-
-                        throw new AMQVMBrokerCreationException(null, port, because + " Stopped binding of InVM Qpid.AMQP", e);
-                    }
-                }
-
-            }
-            else
-            {
-                _logger.info("InVM Qpid.AMQP on port " + port + " already exits.");
-            }
-        }
-    }
-
-    private static IoHandlerAdapter createBrokerInstance(int port) throws AMQVMBrokerCreationException
-    {
-        String protocolProviderClass = System.getProperty("amqj.protocolprovider.class", DEFAULT_QPID_SERVER);
-        _logger.info("Creating Qpid protocol provider: " + protocolProviderClass);
-
-        // can't use introspection to get Provider as it is a server class.
-        // need to go straight to IoHandlerAdapter but that requries the queues and exchange from the ApplicationRegistry which we can't access.
-
-        // get right constructor and pass in instancec ID - "port"
-        IoHandlerAdapter provider;
-        try
-        {
-            Class[] cnstr = {Integer.class};
-            Object[] params = {port};
-
-            ProtocolEngineFactory engineFactory = (ProtocolEngineFactory) Class.forName(protocolProviderClass).getConstructor(cnstr).newInstance(params);
-            provider = new MinaNetworkHandler(null, engineFactory);
-
-            _logger.info("Created VMBroker Instance:" + port);
-        }
-        catch (Exception e)
-        {
-            _logger.info("Unable to create InVM Qpid.AMQP on port " + port + ". Because: " + e.getCause());
-            String because;
-            if (e.getCause() == null)
-            {
-                because = e.toString();
-            }
-            else
-            {
-                because = e.getCause().toString();
-            }
-
-            AMQVMBrokerCreationException amqbce =
-                    new AMQVMBrokerCreationException(null, port, because + " Stopped InVM Qpid.AMQP creation", e);
-            throw amqbce;
-        }
-
-        return provider;
-    }
-
-    public static void killAllVMBrokers()
-    {
-        _logger.info("Killing all VM Brokers");
-        synchronized(TransportConnection.class)
-        {
-            if (_acceptor != null)
-            {
-                _acceptor.unbindAll();
-            }
-            synchronized (VMBrokerMap.class)
-            {
-                VMBrokerMap.clear();
-            }
-            _acceptor = null;
-        }
-        _currentInstance = -1;
-        _currentVMPort = -1;
-    }
-
-    public static void killVMBroker(int port)
-    {
-        synchronized (VMBrokerMap.class)
-        {
-            if (VMBrokerMap.contains(port))
-            {
-                _logger.info("Killing VM Broker:" + port);
-                VmPipeAddress address = VMBrokerMap.remove(port);
-                // This does need to be sychronized as otherwise mina can hang
-                // if a new connection is made
-                _acceptor.unbind(address);
-            }
-        }
-    }
-
-}
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java b/qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java
index f3f74dd332..03167561ef 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java
@@ -45,7 +45,7 @@ public class URLParser
     private void parseURL(String fullURL) throws URLSyntaxException
     {
         // Connection URL format
-        // amqp://[user:pass@][clientid]/virtualhost?brokerlist='tcp://host:port?option=\'value\',option=\'value\';vm://:3/virtualpath?option=\'value\'',failover='method?option=\'value\',option='value''"
+        // amqp://[user:pass@][clientid]/virtualhost?brokerlist='tcp://host:port?option=\'value\',option=\'value\';tcp://host:port?option=\'value\'',failover='method?option=\'value\',option='value''"
         // Options are of course optional except for requiring a single broker in the broker list.
         try
         {
@@ -195,7 +195,7 @@ public class URLParser
         {
             String brokerlist = _url.getOptions().get(AMQConnectionURL.OPTIONS_BROKERLIST);
 
-            // brokerlist tcp://host:port?option='value',option='value';vm://:3/virtualpath?option='value'
+            // brokerlist tcp://host:port?option='value',option='value';tcp://host:port/virtualpath?option='value'
             StringTokenizer st = new StringTokenizer(brokerlist, "" + URLHelper.BROKER_SEPARATOR);
 
             while (st.hasMoreTokens())
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
deleted file mode 100644
index dc0d9b8c78..0000000000
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
+++ /dev/null
@@ -1,60 +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.client.vmbroker;
-
-import org.apache.qpid.client.transport.AMQTransportConnectionException;
-import org.apache.qpid.protocol.AMQConstant;
-
-/**
- * AMQVMBrokerCreationException represents failure to create an in VM broker on the vm transport medium.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Represent failure to create an in VM broker.
- * </table>
- *
- * @todo Error code never used. This is not an AMQException.
- */
-public class AMQVMBrokerCreationException extends AMQTransportConnectionException
-{
-    private int _port;
-
-    /**
-     * @param port
-     *
-     * @deprecated
-     */
-    public AMQVMBrokerCreationException(int port)
-    {
-        this(null, port, "Unable to create vm broker", null);
-    }
-
-    public AMQVMBrokerCreationException(AMQConstant errorCode, int port, String message, Throwable cause)
-    {
-        super(errorCode, message, cause);
-        _port = port;
-    }
-
-    public String toString()
-    {
-        return super.toString() + " on port " + _port;
-    }
-}
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
index 1aca28aa3a..4db6a11e4d 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
@@ -53,7 +53,6 @@ public interface BrokerDetails
     public static final int DEFAULT_PORT = 5672;
 
     public static final String TCP = "tcp";
-    public static final String VM = "vm";
 
     public static final String DEFAULT_TRANSPORT = TCP;
 
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
index 0e8ca60686..26641982d7 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
@@ -27,7 +27,7 @@ import java.util.List;
 
 /**
  Connection URL format
- amqp://[user:pass@][clientid]/virtualhost?brokerlist='tcp://host:port?option=\'value\'&option=\'value\';vm://:3/virtualpath?option=\'value\''&failover='method?option=\'value\'&option='value''"
+ amqp://[user:pass@][clientid]/virtualhost?brokerlist='tcp://host:port?option=\'value\'&option=\'value\';tcp://host:port/virtualpath?option=\'value\''&failover='method?option=\'value\'&option='value''"
  Options are of course optional except for requiring a single broker in the broker list.
  The option seperator is defined to be either '&' or ','
   */