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

8 files changed, 51 insertions, 65 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java
index 124c2a7d08..78217c36ac 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java
@@ -47,7 +47,7 @@ import org.apache.qpid.server.logging.management.LoggingManagementMBean;
 import org.apache.qpid.server.logging.messages.BrokerMessages;
 import org.apache.qpid.server.protocol.AMQProtocolEngineFactory;
 import org.apache.qpid.server.protocol.MultiVersionProtocolEngineFactory;
-import org.apache.qpid.server.protocol.MultiVersionProtocolEngineFactory.VERSION;
+import org.apache.qpid.server.protocol.AmqpProtocolVersion;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry;
 import org.apache.qpid.server.transport.QpidAcceptor;
@@ -192,24 +192,24 @@ public class Broker
             {
                 for(int port : ports)
                 {
-                    Set<VERSION> supported = EnumSet.allOf(VERSION.class);
+                    Set<AmqpProtocolVersion> supported = EnumSet.allOf(AmqpProtocolVersion.class);
 
                     if(exclude_0_10.contains(port))
                     {
-                        supported.remove(VERSION.v0_10);
+                        supported.remove(AmqpProtocolVersion.v0_10);
                     }
 
                     if(exclude_0_9_1.contains(port))
                     {
-                        supported.remove(VERSION.v0_9_1);
+                        supported.remove(AmqpProtocolVersion.v0_9_1);
                     }
                     if(exclude_0_9.contains(port))
                     {
-                        supported.remove(VERSION.v0_9);
+                        supported.remove(AmqpProtocolVersion.v0_9);
                     }
                     if(exclude_0_8.contains(port))
                     {
-                        supported.remove(VERSION.v0_8);
+                        supported.remove(AmqpProtocolVersion.v0_8);
                     }
 
                     NetworkTransportConfiguration settings = 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java
index bf554c526f..5bea33e5f3 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java
@@ -39,10 +39,9 @@ public class BrokerOptions
     public static final String SSL_PORTS = "s";
     public static final String BIND = "b";
     public static final String MANAGEMENT = "m";
-    public static final String LOG4J = "l";
+    public static final String LOG_CONFIG = "l";
     public static final String WATCH = "w";
     public static final String CONFIG = "c";
-    public static final String PROTOCOL = "protocol";
 
     private final Set<Integer> _ports = new HashSet<Integer>();
     private final Set<Integer> _sslPorts = new HashSet<Integer>();
@@ -51,7 +50,6 @@ public class BrokerOptions
     private String _configFile;
     private String _logConfigFile;
     private String _bind;
-    private String _transport = Transport.TCP;
     private Integer _jmxPort;
 
     private Integer _logWatchFrequency = 0;
@@ -147,14 +145,4 @@ public class BrokerOptions
     {
         _logWatchFrequency = logWatchFrequency;
     }
-
-    public String getTransport()
-    {
-        return _transport;
-    }
-
-    public void setTransport(final String transport)
-    {
-        _transport = transport;
-    }
 }
\ No newline at end of file
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
index 317459942a..b9a1106b44 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
@@ -133,21 +133,21 @@ public class Main
         Option bind =
                 OptionBuilder.withArgName("bind").hasArg()
                         .withDescription("bind to the specified address. Overrides any value in the config file")
-                        .withLongOpt("bind").create("b");
+                        .withLongOpt("bind").create(BrokerOptions.BIND);
         Option logconfig =
                 OptionBuilder.withArgName("logconfig").hasArg()
                         .withDescription("use the specified log4j xml configuration file. By "
                                          + "default looks for a file named " + BrokerOptions.DEFAULT_LOG_CONFIG_FILE
-                                         + " in the same directory as the configuration file").withLongOpt("logconfig").create("l");
+                                         + " in the same directory as the configuration file").withLongOpt("logconfig").create(BrokerOptions.LOG_CONFIG);
         Option logwatchconfig =
                 OptionBuilder.withArgName("logwatch").hasArg()
                         .withDescription("monitor the log file configuration file for changes. Units are seconds. "
-                                         + "Zero means do not check for changes.").withLongOpt("logwatch").create("w");
+                                         + "Zero means do not check for changes.").withLongOpt("logwatch").create(BrokerOptions.WATCH);
 
         Option sslport =
                 OptionBuilder.withArgName("sslport").hasArg()
                         .withDescription("SSL port. Overrides any value in the config file")
-                        .withLongOpt("sslport").create("s");
+                        .withLongOpt("sslport").create(BrokerOptions.SSL_PORTS);
 
         options.addOption(help);
         options.addOption(version);
@@ -179,7 +179,7 @@ public class Main
             options.setLogWatchFrequency(Integer.parseInt(logWatchConfig) * 1000);
         }
 
-        String logConfig = commandLine.getOptionValue(BrokerOptions.LOG4J);
+        String logConfig = commandLine.getOptionValue(BrokerOptions.LOG_CONFIG);
         if(logConfig != null)
         {
             options.setLogConfigFile(logConfig);
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
index 9c02cd9d2f..08f276ae72 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
@@ -40,7 +40,6 @@ import javax.management.JMException;
 import javax.security.sasl.SaslServer;
 
 import org.apache.log4j.Logger;
-import org.apache.mina.transport.vmpipe.VmPipeAddress;
 import org.apache.qpid.AMQChannelException;
 import org.apache.qpid.AMQConnectionException;
 import org.apache.qpid.AMQException;
@@ -830,16 +829,10 @@ public class AMQProtocolEngine implements ProtocolEngine, Managable, AMQProtocol
     public String getLocalFQDN()
     {
         SocketAddress address = _network.getLocalAddress();
-        // we use the vmpipe address in some tests hence the need for this rather ugly test. The host
-        // information is used by SASL primary.
         if (address instanceof InetSocketAddress)
         {
             return ((InetSocketAddress) address).getHostName();
         }
-        else if (address instanceof VmPipeAddress)
-        {
-            return "vmpipe:" + ((VmPipeAddress) address).getPort();
-        }
         else
         {
             throw new IllegalArgumentException("Unsupported socket address class: " + address);
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AmqpProtocolVersion.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AmqpProtocolVersion.java
new file mode 100644
index 0000000000..e925d7a1ec
--- /dev/null
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AmqpProtocolVersion.java
@@ -0,0 +1,23 @@
+/*
+ *
+ * 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.server.protocol;
+
+public enum AmqpProtocolVersion { v0_8, v0_9, v0_9_1, v0_10 }
\ No newline at end of file
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
index 064d8f19a6..01b12b44ce 100755
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
@@ -23,7 +23,6 @@ package org.apache.qpid.server.protocol;
 
 import org.apache.log4j.Logger;
 import org.apache.qpid.protocol.ProtocolEngine;
-import org.apache.qpid.server.protocol.MultiVersionProtocolEngineFactory.VERSION;
 import org.apache.qpid.server.registry.IApplicationRegistry;
 import org.apache.qpid.server.transport.ServerConnection;
 import org.apache.qpid.transport.ConnectionDelegate;
@@ -38,7 +37,7 @@ public class MultiVersionProtocolEngine implements ProtocolEngine
 {
     private static final Logger _logger = Logger.getLogger(MultiVersionProtocolEngine.class);
 
-    private Set<VERSION> _supported;
+    private Set<AmqpProtocolVersion> _supported;
     private String _fqdn;
     private IApplicationRegistry _appRegistry;
     private NetworkConnection _network;
@@ -48,7 +47,7 @@ public class MultiVersionProtocolEngine implements ProtocolEngine
 
     public MultiVersionProtocolEngine(IApplicationRegistry appRegistry,
                                       String fqdn,
-                                      Set<VERSION> supported,
+                                      Set<AmqpProtocolVersion> supported,
                                       NetworkConnection network)
     {
         _appRegistry = appRegistry;
@@ -152,7 +151,7 @@ private static final byte[] AMQP_0_9_1_HEADER =
 
     private static interface DelegateCreator
     {
-        VERSION getVersion();
+        AmqpProtocolVersion getVersion();
         byte[] getHeaderIdentifier();
         ProtocolEngine getProtocolEngine();
     }
@@ -160,9 +159,9 @@ private static final byte[] AMQP_0_9_1_HEADER =
     private DelegateCreator creator_0_8 = new DelegateCreator()
     {
 
-        public VERSION getVersion()
+        public AmqpProtocolVersion getVersion()
         {
-            return VERSION.v0_8;
+            return AmqpProtocolVersion.v0_8;
         }
 
         public byte[] getHeaderIdentifier()
@@ -179,9 +178,9 @@ private static final byte[] AMQP_0_9_1_HEADER =
     private DelegateCreator creator_0_9 = new DelegateCreator()
     {
 
-        public VERSION getVersion()
+        public AmqpProtocolVersion getVersion()
         {
-            return VERSION.v0_9;
+            return AmqpProtocolVersion.v0_9;
         }
 
 
@@ -199,9 +198,9 @@ private static final byte[] AMQP_0_9_1_HEADER =
     private DelegateCreator creator_0_9_1 = new DelegateCreator()
     {
 
-        public VERSION getVersion()
+        public AmqpProtocolVersion getVersion()
         {
-            return VERSION.v0_9_1;
+            return AmqpProtocolVersion.v0_9_1;
         }
 
 
@@ -220,9 +219,9 @@ private static final byte[] AMQP_0_9_1_HEADER =
     private DelegateCreator creator_0_10 = new DelegateCreator()
     {
 
-        public VERSION getVersion()
+        public AmqpProtocolVersion getVersion()
         {
-            return VERSION.v0_10;
+            return AmqpProtocolVersion.v0_10;
         }
 
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
index 5ccd4ff188..96d46353c6 100755
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
@@ -20,8 +20,7 @@
 */
 package org.apache.qpid.server.protocol;
 
-import java.util.Arrays;
-import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Set;
 
 import org.apache.qpid.protocol.ProtocolEngine;
@@ -32,13 +31,11 @@ import org.apache.qpid.transport.network.NetworkConnection;
 
 public class MultiVersionProtocolEngineFactory implements ProtocolEngineFactory
 {
-    public enum VERSION { v0_8, v0_9, v0_9_1, v0_10 };
-
-    private static final Set<VERSION> ALL_VERSIONS = new HashSet<VERSION>(Arrays.asList(VERSION.values()));
+    private static final Set<AmqpProtocolVersion> ALL_VERSIONS = EnumSet.allOf(AmqpProtocolVersion.class);
 
     private final IApplicationRegistry _appRegistry;
     private final String _fqdn;
-    private final Set<VERSION> _supported;
+    private final Set<AmqpProtocolVersion> _supported;
 
 
     public MultiVersionProtocolEngineFactory()
@@ -46,7 +43,7 @@ public class MultiVersionProtocolEngineFactory implements ProtocolEngineFactory
         this(1, "localhost", ALL_VERSIONS);
     }
 
-    public MultiVersionProtocolEngineFactory(String fqdn, Set<VERSION> versions)
+    public MultiVersionProtocolEngineFactory(String fqdn, Set<AmqpProtocolVersion> versions)
     {
         this(1, fqdn, versions);
     }
@@ -57,7 +54,7 @@ public class MultiVersionProtocolEngineFactory implements ProtocolEngineFactory
         this(1, fqdn, ALL_VERSIONS);
     }
 
-    public MultiVersionProtocolEngineFactory(int instance, String fqdn, Set<VERSION> supportedVersions)
+    public MultiVersionProtocolEngineFactory(int instance, String fqdn, Set<AmqpProtocolVersion> supportedVersions)
     {
         _appRegistry = ApplicationRegistry.getInstance();
         _fqdn = fqdn;
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
index 35ab28656b..63423cbaa7 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
@@ -21,8 +21,6 @@
 package org.apache.qpid.server;
 
 import static org.apache.qpid.transport.ConnectionSettings.WILDCARD_ADDRESS;
-import static org.apache.qpid.transport.network.Transport.TCP;
-import static org.apache.qpid.transport.network.Transport.VM;
 import static org.apache.qpid.server.configuration.ServerConfiguration.DEFAULT_PORT;
 import static org.apache.qpid.server.configuration.ServerConfiguration.DEFAULT_JMXPORT;
 
@@ -195,16 +193,4 @@ public class BrokerOptionsTest extends QpidTestCase
         _options.setLogWatchFrequency(myFreq);
         assertEquals(myFreq, _options.getLogWatchFrequency());
     }
-    
-    public void testDefaultTransport()
-    {
-        assertEquals(TCP, _options.getTransport());
-    }
-    
-    public void testOverriddenTransport()
-    {
-        _options.setTransport(VM);
-        
-        assertEquals(VM, _options.getTransport());
-    }
 }