qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rob...@apache.org
Subject svn commit: r1143874 [1/2] - in /qpid/trunk/qpid/java: ./ broker/src/main/java/org/apache/qpid/server/ broker/src/main/java/org/apache/qpid/server/protocol/ broker/src/test/java/org/apache/qpid/server/ client/example/src/main/java/org/apache/qpid/examp...
Date Thu, 07 Jul 2011 15:16:36 GMT
Author: robbie
Date: Thu Jul  7 15:16:33 2011
New Revision: 1143874

URL: http://svn.apache.org/viewvc?rev=1143874&view=rev
Log:
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

Added:
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AmqpProtocolVersion.java
      - copied, changed from r1143870, qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java
    qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes
      - copied, changed from r1143870, qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes
    qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile
      - copied, changed from r1143870, qpid/trunk/qpid/java/test-profiles/java-derby.0.10.testprofile
    qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
      - copied, changed from r1143870, qpid/trunk/qpid/java/test-profiles/java-derby.testprofile
    qpid/trunk/qpid/java/test-profiles/java-dby.0-10.testprofile
      - copied, changed from r1143870, qpid/trunk/qpid/java/test-profiles/java-derby.0.10.testprofile
    qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile
      - copied, changed from r1143870, qpid/trunk/qpid/java/test-profiles/java-derby.testprofile
    qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
      - copied, changed from r1143870, qpid/trunk/qpid/java/test-profiles/java.testprofile
    qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
      - copied, changed from r1143870, qpid/trunk/qpid/java/test-profiles/java.testprofile
    qpid/trunk/qpid/java/test-profiles/java-mms.0-10.testprofile
      - copied, changed from r1143870, qpid/trunk/qpid/java/test-profiles/java.0.10.testprofile
    qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile
      - copied, changed from r1143870, qpid/trunk/qpid/java/test-profiles/internal.testprofile
    qpid/trunk/qpid/java/test-profiles/testprofile.defaults
      - copied, changed from r1143870, qpid/trunk/qpid/java/test-profiles/default.testprofile
Removed:
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
    qpid/trunk/qpid/java/client/src/test/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/common/FixedSizeByteBufferAllocator.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/filter/codec/OurCumulativeProtocolDecoder.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/filter/codec/QpidProtocolCodecFilter.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/mina/transport/vmpipe/QpidVmPipeConnector.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/VMBrokerMap.java
    qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/test/testcases/MessageThroughputPerf.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/AMQPFeatureDecorator.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
    qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes
    qpid/trunk/qpid/java/test-profiles/JavaInVMExcludes
    qpid/trunk/qpid/java/test-profiles/JavaStandaloneExcludes
    qpid/trunk/qpid/java/test-profiles/default.testprofile
    qpid/trunk/qpid/java/test-profiles/internal.testprofile
    qpid/trunk/qpid/java/test-profiles/java-derby.0.10.testprofile
    qpid/trunk/qpid/java/test-profiles/java-derby.testprofile
    qpid/trunk/qpid/java/test-profiles/java.0.10.testprofile
    qpid/trunk/qpid/java/test-profiles/java.testprofile
Modified:
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
    qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
    qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/ConnectionSetup.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
    qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
    qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java
    qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java
    qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
    qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkTransport.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
    qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
    qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/mina/MinaNetworkHandlerTest.java
    qpid/trunk/qpid/java/module.xml
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsConfigurationTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
    qpid/trunk/qpid/java/test-profiles/CPPExcludes
    qpid/trunk/qpid/java/test-profiles/Excludes
    qpid/trunk/qpid/java/test-profiles/Java010Excludes
    qpid/trunk/qpid/java/test-profiles/JavaExcludes
    qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile
    qpid/trunk/qpid/java/test-profiles/cpp.testprofile
    qpid/trunk/qpid/java/test-profiles/test-provider.properties

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java Thu Jul  7 15:16:33 2011
@@ -47,7 +47,7 @@ import org.apache.qpid.server.logging.ma
 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 = 

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java Thu Jul  7 15:16:33 2011
@@ -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

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java Thu Jul  7 15:16:33 2011
@@ -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);

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java Thu Jul  7 15:16:33 2011
@@ -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 implement
     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);

Copied: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AmqpProtocolVersion.java (from r1143870, qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AmqpProtocolVersion.java?p2=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AmqpProtocolVersion.java&p1=qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java&r1=1143870&r2=1143874&rev=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AmqpProtocolVersion.java Thu Jul  7 15:16:33 2011
@@ -18,10 +18,6 @@
  * under the License.
  *
  */
-package org.apache.qpid.transport.network;
+package org.apache.qpid.server.protocol;
 
-public class Transport
-{
-    public static final String TCP = "tcp";
-    public static final String VM = "vm";
-}
+public enum AmqpProtocolVersion { v0_8, v0_9, v0_9_1, v0_10 }
\ No newline at end of file

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java Thu Jul  7 15:16:33 2011
@@ -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 
 {
     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 
 
     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_H
 
     private static interface DelegateCreator
     {
-        VERSION getVersion();
+        AmqpProtocolVersion getVersion();
         byte[] getHeaderIdentifier();
         ProtocolEngine getProtocolEngine();
     }
@@ -160,9 +159,9 @@ private static final byte[] AMQP_0_9_1_H
     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_H
     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_H
     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_H
     private DelegateCreator creator_0_10 = new DelegateCreator()
     {
 
-        public VERSION getVersion()
+        public AmqpProtocolVersion getVersion()
         {
-            return VERSION.v0_10;
+            return AmqpProtocolVersion.v0_10;
         }
 
 

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java Thu Jul  7 15:16:33 2011
@@ -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
 
 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 MultiVersionProtocolEngineF
         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 MultiVersionProtocolEngineF
         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;

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java Thu Jul  7 15:16:33 2011
@@ -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 Q
         _options.setLogWatchFrequency(myFreq);
         assertEquals(myFreq, _options.getLogWatchFrequency());
     }
-    
-    public void testDefaultTransport()
-    {
-        assertEquals(TCP, _options.getTransport());
-    }
-    
-    public void testOverriddenTransport()
-    {
-        _options.setTransport(VM);
-        
-        assertEquals(VM, _options.getTransport());
-    }
 }

Modified: qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/ConnectionSetup.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/ConnectionSetup.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/ConnectionSetup.java (original)
+++ qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/ConnectionSetup.java Thu Jul  7 15:16:33 2011
@@ -33,7 +33,6 @@ import java.util.Properties;
  * It is equivalent to a PropertyFile of value:
  *
  * connectionfactory.local=amqp://guest:guest@clientid/test?brokerlist='localhost'
- * connectionfactory.vm=amqp://guest:guest@clientid/test?brokerlist='vm://:1'
  *
  * queue.queue=example.MyQueue
  * topic.topic=example.hierarical.topic
@@ -61,7 +60,6 @@ public class ConnectionSetup
         Properties properties = new Properties();
         properties.put(Context.INITIAL_CONTEXT_FACTORY, INITIAL_CONTEXT_FACTORY);
         properties.put("connectionfactory." + CONNECTION_JNDI_NAME, CONNECTION_NAME);
-        properties.put("connectionfactory." + "vm", "amqp://guest:guest@clientid/test?brokerlist='vm://:1'");
 
         properties.put("queue." + QUEUE_JNDI_NAME, QUEUE_NAME);
         properties.put("topic." + TOPIC_JNDI_NAME, TOPIC_NAME);

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java Thu Jul  7 15:16:33 2011
@@ -56,8 +56,7 @@ public class AMQBrokerDetails implements
             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
 
         sb.append(_transport);
         sb.append("://");
-
-        if (!(_transport.equalsIgnoreCase(VM)))
-        {
-            sb.append(_host);
-        }
-
+        sb.append(_host);
         sb.append(':');
         sb.append(_port);
 

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java Thu Jul  7 15:16:33 2011
@@ -328,7 +328,7 @@ public class AMQConnection extends Close
         
         _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);
         } 

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java Thu Jul  7 15:16:33 2011
@@ -39,7 +39,6 @@ import org.apache.qpid.client.failover.F
 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;

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java Thu Jul  7 15:16:33 2011
@@ -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
 
         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);
-
-    }
 }

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java Thu Jul  7 15:16:33 2011
@@ -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())

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java Thu Jul  7 15:16:33 2011
@@ -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;
 

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java Thu Jul  7 15:16:33 2011
@@ -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 ','
   */

Modified: qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java (original)
+++ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java Thu Jul  7 15:16:33 2011
@@ -73,7 +73,7 @@ public class AMQProtocolHandlerTest exte
     public void setUp() throws Exception
     {
         //Create a new ProtocolHandler with a fake connection.
-        _handler = new AMQProtocolHandler(new MockAMQConnection("amqp://guest:guest@client/test?brokerlist='vm://:1'"));
+        _handler = new AMQProtocolHandler(new MockAMQConnection("amqp://guest:guest@client/test?brokerlist='tcp://localhost:1'"));
         _handler.setNetworkConnection(new TestNetworkConnection());
          AMQBody body = BasicRecoverOkBodyImpl.getFactory().newInstance(null, 1);
         _blockFrame = new AMQFrame(0, body);

Modified: qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java (original)
+++ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java Thu Jul  7 15:16:33 2011
@@ -50,7 +50,7 @@ public class UsernameHashedPasswordCallb
     {
         super.setUp();
 
-        final String url = "amqp://username:password@client/test?brokerlist='vm://:1'";
+        final String url = "amqp://username:password@client/test?brokerlist='tcp://localhost:1'";
         _callbackHandler.initialise(new AMQConnectionURL(url));
     }
 

Modified: qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java (original)
+++ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java Thu Jul  7 15:16:33 2011
@@ -46,7 +46,7 @@ public class UsernamePasswordCallbackHan
     {
         super.setUp();
 
-        final String url = "amqp://username:password@client/test?brokerlist='vm://:1'";
+        final String url = "amqp://username:password@client/test?brokerlist='tcp://localhost:1'";
 
         _callbackHandler.initialise(new AMQConnectionURL(url));
     }

Modified: qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java (original)
+++ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java Thu Jul  7 15:16:33 2011
@@ -43,15 +43,6 @@ public class BrokerDetailsTest extends T
         assertTrue(broker.getProperty("immediatedelivery").equals("true"));
     }
 
-    public void testVMBroker() throws URLSyntaxException
-    {
-        String url = "vm://:2";
-
-        AMQBrokerDetails broker = new AMQBrokerDetails(url);
-        assertTrue(broker.getTransport().equals("vm"));
-        assertEquals(broker.getPort(), 2);
-    }
-
     public void testTransportsDefaultToTCP() throws URLSyntaxException
     {
         String url = "localhost:5672";

Modified: qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java (original)
+++ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java Thu Jul  7 15:16:33 2011
@@ -300,53 +300,6 @@ public class ConnectionURLTest extends T
         assertTrue(connectionurl.getOption("immediatedelivery").equals("true"));
     }
 
-    public void testSinglevmURL() throws URLSyntaxException
-    {
-        String url = "amqp://guest:guest@/test?brokerlist='vm://:2'";
-
-        ConnectionURL connectionurl = new AMQConnectionURL(url);
-
-        assertTrue(connectionurl.getFailoverMethod() == null);
-        assertTrue(connectionurl.getUsername().equals("guest"));
-        assertTrue(connectionurl.getPassword().equals("guest"));
-        assertTrue(connectionurl.getVirtualHost().equals("/test"));
-
-        assertTrue(connectionurl.getBrokerCount() == 1);
-
-        BrokerDetails service = connectionurl.getBrokerDetails(0);
-
-        assertTrue(service.getTransport().equals("vm"));
-        assertTrue(service.getHost().equals(""));
-        assertTrue(service.getPort() == 2);
-
-    }
-
-    public void testFailoverVMURL() throws URLSyntaxException
-    {
-        String url = "amqp://ritchiem:bob@/test?brokerlist='vm://:2;vm://:3',failover='roundrobin'";
-
-        ConnectionURL connectionurl = new AMQConnectionURL(url);
-
-        assertTrue(connectionurl.getFailoverMethod().equals("roundrobin"));
-        assertTrue(connectionurl.getUsername().equals("ritchiem"));
-        assertTrue(connectionurl.getPassword().equals("bob"));
-        assertTrue(connectionurl.getVirtualHost().equals("/test"));
-
-        assertTrue(connectionurl.getBrokerCount() == 2);
-
-        BrokerDetails service = connectionurl.getBrokerDetails(0);
-
-        assertTrue(service.getTransport().equals("vm"));
-        assertTrue(service.getHost().equals(""));
-        assertTrue(service.getPort() == 2);
-
-        service = connectionurl.getBrokerDetails(1);
-        assertTrue(service.getTransport().equals("vm"));
-        assertTrue(service.getHost().equals(""));
-        assertTrue(service.getPort() == 3);
-    }
-
-
     public void testNoVirtualHostURL()
     {
         String url = "amqp://user@?brokerlist='tcp://localhost:5672'";

Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java Thu Jul  7 15:16:33 2011
@@ -23,5 +23,4 @@ package org.apache.qpid.transport.networ
 public class Transport
 {
     public static final String TCP = "tcp";
-    public static final String VM = "vm";
 }

Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkTransport.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkTransport.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkTransport.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkTransport.java Thu Jul  7 15:16:33 2011
@@ -36,8 +36,6 @@ import org.apache.mina.transport.socket.
 import org.apache.mina.transport.socket.nio.SocketConnectorConfig;
 import org.apache.mina.transport.socket.nio.SocketSessionConfig;
 import org.apache.mina.util.NewThreadExecutor;
-import org.apache.mina.transport.vmpipe.QpidVmPipeConnector;
-import org.apache.mina.transport.vmpipe.VmPipeAddress;
 
 import org.apache.qpid.protocol.ProtocolEngineFactory;
 import org.apache.qpid.ssl.SSLContextFactory;
@@ -51,7 +49,6 @@ import org.apache.qpid.transport.network
 import org.apache.qpid.transport.network.NetworkConnection;
 import org.apache.qpid.transport.network.OutgoingNetworkTransport;
 import org.apache.qpid.transport.network.Transport;
-import org.apache.qpid.transport.network.VMBrokerMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,7 +56,6 @@ public class MinaNetworkTransport implem
 {
     private static final int UNKNOWN = -1;
     private static final int TCP = 0;
-    private static final int VM = 1;
 
     public NetworkConnection _connection;
     private SocketAcceptor _acceptor;
@@ -83,16 +79,6 @@ public class MinaNetworkTransport implem
                 });
                 _connection = stc.connect(delegate, settings, sslFactory);
                 break;
-            case VM:
-                stc = new IoConnectorCreator(new SocketConnectorFactory()
-                {
-                    public IoConnector newConnector()
-                    {
-                        return new QpidVmPipeConnector();
-                    }
-                });
-                _connection = stc.connect(delegate, settings, sslFactory);
-                break;
             case UNKNOWN:
             default:
                     throw new TransportException("Unknown protocol: " + settings.getProtocol());
@@ -108,12 +94,7 @@ public class MinaNetworkTransport implem
             return TCP;
         }
 
-        if (transport.equals(Transport.VM))
-        {
-            return VM;
-        }
-
-        return -1;
+        return UNKNOWN;
     }
 
     public void close()
@@ -198,18 +179,6 @@ public class MinaNetworkTransport implem
             {
                 address = new InetSocketAddress(settings.getHost(), port);
             }
-            else if(Transport.VM.equalsIgnoreCase(protocol))
-            {
-                synchronized (VMBrokerMap.class)
-                {
-                    if(!VMBrokerMap.contains(port))
-                    {
-                        throw new TransportException("VM broker on port " + port + " does not exist.");
-                    }
-                }
-
-                address = new VmPipeAddress(port);
-            }
             else
             {
                 throw new TransportException("Unknown transport: " + protocol);

Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java Thu Jul  7 15:16:33 2011
@@ -31,9 +31,6 @@ public class URLHelper
 
     public static void parseOptions(Map<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;

Modified: qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java (original)
+++ qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java Thu Jul  7 15:16:33 2011
@@ -31,6 +31,7 @@ import junit.framework.TestCase;
 import junit.framework.TestResult;
 
 import org.apache.log4j.Logger;
+import org.apache.mina.util.AvailablePortFinder;
 
 public class QpidTestCase extends TestCase
 {
@@ -127,4 +128,9 @@ public class QpidTestCase extends TestCa
         
         return storeClass != null ? storeClass : MEMORY_STORE_CLASS_NAME ;
     }
+
+    public int findFreePort()
+    {
+        return AvailablePortFinder.getNextAvailable(10000);
+    }
 }

Modified: qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/mina/MinaNetworkHandlerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/mina/MinaNetworkHandlerTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/mina/MinaNetworkHandlerTest.java (original)
+++ qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/mina/MinaNetworkHandlerTest.java Thu Jul  7 15:16:33 2011
@@ -31,7 +31,6 @@ import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.mina.util.AvailablePortFinder;
 import org.apache.qpid.framing.AMQDataBlock;
 import org.apache.qpid.protocol.ProtocolEngine;
 import org.apache.qpid.protocol.ProtocolEngineFactory;
@@ -61,7 +60,7 @@ public class MinaNetworkHandlerTest exte
     public void setUp() throws Exception
     {
         String host = InetAddress.getLocalHost().getHostName();
-        _testPort = AvailablePortFinder.getNextAvailable(10000);
+        _testPort = findFreePort();
 
         _clientSettings = new ConnectionSettings();
         _clientSettings.setHost(host);

Modified: qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Thu Jul  7 15:16:33 2011
@@ -295,7 +295,7 @@
   </target>
 
 
-  <property name="profile" value="default"/>
+  <property name="profile" value="java-mms.0-10"/>
   <property name="testprofile.file" value="${test.profiles}/${profile}.testprofile"/>
   
   <available file="${testprofile.file}" property="testprofile.file.present"/>
@@ -303,15 +303,14 @@
 
   <property file="${testprofile.file}" prefix="preload"/>
   <property name="preload.include" value=""/>
-  <condition property="profiles"
-             value="${preload.include} ${profile}"
-             else="default ${preload.include} ${profile}">
-    <equals arg1="${profile}" arg2="default"/>
-  </condition>
+  <property name="profiles" value="${preload.include} ${profile}"/>
   <map property="_profile_files" value="${profiles}" join=" ">
     <globmapper from="*" to="*.testprofile"/>
   </map>
+  
+  <delete file="${build.scratch}/test-${profile}.properties" quiet="true"/>
   <concat destfile="${build.scratch}/test-${profile}.properties" force="no" fixlastline="yes">
+    <filelist dir="${test.profiles}" files="testprofile.defaults"/>
     <filelist dir="${test.profiles}" files="${_profile_files}"/>
   </concat>
   <property file="${build.scratch}/test-${profile}.properties"/>
@@ -320,7 +319,6 @@
     <globmapper from="*" to="${test.profiles}/*"/>
   </map>
 
-
   <condition property="dontruntest" value="dontruntest" else="runtest">
          <contains substring="${module.name}" string="${exclude.modules}" />
   </condition>
@@ -348,15 +346,6 @@
       <sysproperty key="log4j.configuration" value="${log4j.configuration}"/>
       <sysproperty key="java.naming.factory.initial" value="${java.naming.factory.initial}"/>
       <sysproperty key="java.naming.provider.url" value="${java.naming.provider.url}"/>
-      <sysproperty key="broker" value="${broker}"/>
-      <sysproperty key="broker.clean" value="${broker.clean}"/>
-      <sysproperty key="broker.clean.between.tests" value="${broker.clean.between.tests}"/>
-      <sysproperty key="broker.existing.qpid.work" value="${broker.existing.qpid.work}"/>
-      <sysproperty key="broker.persistent" value="${broker.persistent}"/>
-      <sysproperty key="broker.version" value="${broker.version}"/>
-      <sysproperty key="broker.ready" value="${broker.ready}" />
-      <sysproperty key="broker.stopped" value="${broker.stopped}" />
-      <sysproperty key="broker.config" value="${broker.config}" />
       <sysproperty key="messagestore.class.name" value="${messagestore.class.name}" />
       <sysproperty key="test.output" value="${module.results}"/>
       <sysproperty key="qpid.amqp.version" value="${qpid.amqp.version}"/>

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java Thu Jul  7 15:16:33 2011
@@ -30,7 +30,6 @@ import javax.jms.TextMessage;
 
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
-import org.apache.qpid.client.transport.TransportConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java Thu Jul  7 15:16:33 2011
@@ -36,7 +36,6 @@ import javax.jms.Session;
 import javax.naming.Context;
 import javax.naming.spi.InitialContextFactory;
 
-import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.jndi.PropertiesFileInitialContextFactory;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 import org.slf4j.Logger;

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsConfigurationTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsConfigurationTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsConfigurationTest.java Thu Jul  7 15:16:33 2011
@@ -55,12 +55,9 @@ public class MessageStatisticsConfigurat
         assertEquals("Incorrect vhost data", 0, vhost.getTotalDataReceived());
         assertFalse("Vhost statistics should not be enabled", vhost.isStatisticsEnabled());
 
-        if (!_brokerType.equals(VM))
-        {
-            assertEquals("Incorrect server total messages", 5, _jmxUtils.getServerInformation().getTotalMessagesReceived());
-            assertEquals("Incorrect server total data", 1000, _jmxUtils.getServerInformation().getTotalDataReceived());
-            assertTrue("Server statistics should be enabled", _jmxUtils.getServerInformation().isStatisticsEnabled());
-        }
+        assertEquals("Incorrect server total messages", 5, _jmxUtils.getServerInformation().getTotalMessagesReceived());
+        assertEquals("Incorrect server total data", 1000, _jmxUtils.getServerInformation().getTotalDataReceived());
+        assertTrue("Server statistics should be enabled", _jmxUtils.getServerInformation().isStatisticsEnabled());
     }
 
     /**
@@ -83,12 +80,9 @@ public class MessageStatisticsConfigurat
         assertEquals("Incorrect vhost data", 1000, vhost.getTotalDataReceived());
         assertTrue("Vhost statistics should be enabled", vhost.isStatisticsEnabled());
 
-        if (!_brokerType.equals(VM))
-        {
-            assertEquals("Incorrect server total messages", 0, _jmxUtils.getServerInformation().getTotalMessagesReceived());
-            assertEquals("Incorrect server total data", 0, _jmxUtils.getServerInformation().getTotalDataReceived());
-            assertFalse("Server statistics should not be enabled", _jmxUtils.getServerInformation().isStatisticsEnabled());
-        }
+        assertEquals("Incorrect server total messages", 0, _jmxUtils.getServerInformation().getTotalMessagesReceived());
+        assertEquals("Incorrect server total data", 0, _jmxUtils.getServerInformation().getTotalDataReceived());
+        assertFalse("Server statistics should not be enabled", _jmxUtils.getServerInformation().isStatisticsEnabled());
     }
 
     /**
@@ -111,12 +105,9 @@ public class MessageStatisticsConfigurat
         assertEquals("Incorrect vhost data", 0, vhost.getTotalDataReceived());
         assertFalse("Vhost statistics should not be enabled", vhost.isStatisticsEnabled());
 
-        if (!_brokerType.equals(VM))
-        {
-            assertEquals("Incorrect server total messages", 0, _jmxUtils.getServerInformation().getTotalMessagesReceived());
-            assertEquals("Incorrect server total data", 0, _jmxUtils.getServerInformation().getTotalDataReceived());
-            assertFalse("Server statistics should not be enabled", _jmxUtils.getServerInformation().isStatisticsEnabled());
-        }
+        assertEquals("Incorrect server total messages", 0, _jmxUtils.getServerInformation().getTotalMessagesReceived());
+        assertEquals("Incorrect server total data", 0, _jmxUtils.getServerInformation().getTotalDataReceived());
+        assertFalse("Server statistics should not be enabled", _jmxUtils.getServerInformation().isStatisticsEnabled());
     }
 
     /**
@@ -139,12 +130,9 @@ public class MessageStatisticsConfigurat
         assertEquals("Incorrect vhost data", 1000, vhost.getTotalDataReceived());
         assertTrue("Vhost statistics should be enabled", vhost.isStatisticsEnabled());
 
-        if (!_brokerType.equals(VM))
-        {
-            assertEquals("Incorrect server total messages", 5, _jmxUtils.getServerInformation().getTotalMessagesReceived());
-            assertEquals("Incorrect server total data", 1000, _jmxUtils.getServerInformation().getTotalDataReceived());
-            assertTrue("Server statistics should be enabled", _jmxUtils.getServerInformation().isStatisticsEnabled());
-        }
+        assertEquals("Incorrect server total messages", 5, _jmxUtils.getServerInformation().getTotalMessagesReceived());
+        assertEquals("Incorrect server total data", 1000, _jmxUtils.getServerInformation().getTotalDataReceived());
+        assertTrue("Server statistics should be enabled", _jmxUtils.getServerInformation().isStatisticsEnabled());
     }
 
     /**
@@ -167,11 +155,8 @@ public class MessageStatisticsConfigurat
         assertEquals("Incorrect vhost data", 1000, vhost.getTotalDataReceived());
         assertTrue("Vhost statistics should be enabled", vhost.isStatisticsEnabled());
 
-        if (!_brokerType.equals(VM))
-        {
-            assertEquals("Incorrect server total messages", 5, _jmxUtils.getServerInformation().getTotalMessagesReceived());
-            assertEquals("Incorrect server total data", 1000, _jmxUtils.getServerInformation().getTotalDataReceived());
-            assertTrue("Server statistics should be enabled", _jmxUtils.getServerInformation().isStatisticsEnabled());
-        }
+        assertEquals("Incorrect server total messages", 5, _jmxUtils.getServerInformation().getTotalMessagesReceived());
+        assertEquals("Incorrect server total data", 1000, _jmxUtils.getServerInformation().getTotalDataReceived());
+        assertTrue("Server statistics should be enabled", _jmxUtils.getServerInformation().isStatisticsEnabled());
     }
 }

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java Thu Jul  7 15:16:33 2011
@@ -66,11 +66,8 @@ public class MessageStatisticsTest exten
             assertEquals("Incorrect connection total", 45, total);
             assertEquals("Incorrect connection data", 4500, data);
         }
-        if (!_brokerType.equals(VM))
-        {
-            assertEquals("Incorrect server total", 45, _jmxUtils.getServerInformation().getTotalMessagesReceived());
-            assertEquals("Incorrect server data", 4500, _jmxUtils.getServerInformation().getTotalDataReceived());
-        }
+        assertEquals("Incorrect server total", 45, _jmxUtils.getServerInformation().getTotalMessagesReceived());
+        assertEquals("Incorrect server data", 4500, _jmxUtils.getServerInformation().getTotalDataReceived());
         
         if (!isBroker010())
         {
@@ -147,11 +144,8 @@ public class MessageStatisticsTest exten
             assertEquals("Incorrect active connection total", 20, total);
             assertEquals("Incorrect active connection data", 2000, data);
         }
-        if (!_brokerType.equals(VM))
-        {
-            assertEquals("Incorrect server total", 30, _jmxUtils.getServerInformation().getTotalMessagesReceived());
-            assertEquals("Incorrect server data", 3000, _jmxUtils.getServerInformation().getTotalDataReceived());
-        }
+        assertEquals("Incorrect server total", 30, _jmxUtils.getServerInformation().getTotalMessagesReceived());
+        assertEquals("Incorrect server data", 3000, _jmxUtils.getServerInformation().getTotalDataReceived());
         
         if (!isBroker010())
         {
@@ -187,11 +181,8 @@ public class MessageStatisticsTest exten
         assertApprox("Incorrect dev vhost peak messages", 0.2d, 2.0d, dev.getPeakMessageReceiptRate());
         assertApprox("Incorrect dev vhost peak data", 0.2d, 20.0d, dev.getPeakDataReceiptRate());
 
-        if (!_brokerType.equals(VM))
-        {
-            assertApprox("Incorrect server peak messages", 0.2d, 2.0d, _jmxUtils.getServerInformation().getPeakMessageReceiptRate());
-            assertApprox("Incorrect server peak data", 0.2d, 20.0d, _jmxUtils.getServerInformation().getPeakDataReceiptRate());
-        }
+        assertApprox("Incorrect server peak messages", 0.2d, 2.0d, _jmxUtils.getServerInformation().getPeakMessageReceiptRate());
+        assertApprox("Incorrect server peak data", 0.2d, 20.0d, _jmxUtils.getServerInformation().getPeakDataReceiptRate());
     }
     
     /**
@@ -211,11 +202,8 @@ public class MessageStatisticsTest exten
         assertEquals("Incorrect dev vhost total messages", 10, dev.getTotalMessagesReceived());
         assertEquals("Incorrect dev vhost total data", 100, dev.getTotalDataReceived());
 
-        if (!_brokerType.equals(VM))
-        {
-            assertEquals("Incorrect server total messages", 20, _jmxUtils.getServerInformation().getTotalMessagesReceived());
-            assertEquals("Incorrect server total data", 200, _jmxUtils.getServerInformation().getTotalDataReceived());
-        }
+        assertEquals("Incorrect server total messages", 20, _jmxUtils.getServerInformation().getTotalMessagesReceived());
+        assertEquals("Incorrect server total data", 200, _jmxUtils.getServerInformation().getTotalDataReceived());
         
         test.resetStatistics();
         
@@ -224,10 +212,7 @@ public class MessageStatisticsTest exten
         assertEquals("Incorrect dev vhost total messages", 10, dev.getTotalMessagesReceived());
         assertEquals("Incorrect dev vhost total data", 100, dev.getTotalDataReceived());
 
-        if (!_brokerType.equals(VM))
-        {
-            assertEquals("Incorrect server total messages", 20, _jmxUtils.getServerInformation().getTotalMessagesReceived());
-            assertEquals("Incorrect server total data", 200, _jmxUtils.getServerInformation().getTotalDataReceived());
-        }
+        assertEquals("Incorrect server total messages", 20, _jmxUtils.getServerInformation().getTotalMessagesReceived());
+        assertEquals("Incorrect server total data", 200, _jmxUtils.getServerInformation().getTotalDataReceived());
     }
 }

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java Thu Jul  7 15:16:33 2011
@@ -83,15 +83,9 @@ public class MessagingTestConfigProperti
     /** Holds the name of the default connection factory configuration property. */
     public static final String CONNECTION_PROPNAME = "connectionfactory.broker";
 
-    /** Defeins the default connection configuration. */
-    public static final String CONNECTION_DEFAULT = "amqp://guest:guest@clientid/?brokerlist='vm://:1'";
-
     /** Holds the name of the property to get the test broker url from. */
     public static final String BROKER_PROPNAME = "qpid.test.broker";
 
-    /** Holds the default broker url for the test. */
-    public static final String BROKER_DEFAULT = "vm://:1";
-
     /** Holds the name of the property to get the test broker virtual path. */
     public static final String VIRTUAL_HOST_PROPNAME = "virtualHost";
 
@@ -274,7 +268,6 @@ public class MessagingTestConfigProperti
     static
     {
         defaults.setPropertyIfNull(INITIAL_CONTEXT_FACTORY_PROPNAME, INITIAL_CONTEXT_FACTORY_DEFAULT);
-        defaults.setPropertyIfNull(CONNECTION_PROPNAME, CONNECTION_DEFAULT);
         defaults.setPropertyIfNull(MESSAGE_SIZE_PROPNAME, MESSAGE_SIZE_DEAFULT);
         defaults.setPropertyIfNull(PUBLISHER_PRODUCER_BIND_PROPNAME, PUBLISHER_PRODUCER_BIND_DEFAULT);
         defaults.setPropertyIfNull(PUBLISHER_CONSUMER_BIND_PROPNAME, PUBLISHER_CONSUMER_BIND_DEFAULT);
@@ -284,7 +277,6 @@ public class MessagingTestConfigProperti
         defaults.setPropertyIfNull(RECEIVE_DESTINATION_NAME_ROOT_PROPNAME, RECEIVE_DESTINATION_NAME_ROOT_DEFAULT);
         defaults.setPropertyIfNull(PERSISTENT_MODE_PROPNAME, PERSISTENT_MODE_DEFAULT);
         defaults.setPropertyIfNull(TRANSACTED_PROPNAME, TRANSACTED_DEFAULT);
-        defaults.setPropertyIfNull(BROKER_PROPNAME, BROKER_DEFAULT);
         defaults.setPropertyIfNull(VIRTUAL_HOST_PROPNAME, VIRTUAL_HOST_DEFAULT);
         defaults.setPropertyIfNull(RATE_PROPNAME, RATE_DEFAULT);
         defaults.setPropertyIfNull(VERBOSE_PROPNAME, VERBOSE_DEFAULT);

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java Thu Jul  7 15:16:33 2011
@@ -20,55 +20,39 @@
  */
 package org.apache.qpid.server.failover;
 
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+
 import org.apache.qpid.AMQDisconnectedException;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQConnectionURL;
-import org.apache.qpid.client.transport.TransportConnection;
-import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
-import org.apache.qpid.server.util.InternalBrokerBaseCase;
-import org.apache.qpid.url.URLSyntaxException;
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import java.util.concurrent.CountDownLatch;
-
-public class FailoverMethodTest extends InternalBrokerBaseCase implements ExceptionListener
+public class FailoverMethodTest extends QpidBrokerTestCase implements ExceptionListener
 {
     private CountDownLatch _failoverComplete = new CountDownLatch(1);
     protected static final Logger _logger = LoggerFactory.getLogger(FailoverMethodTest.class);
 
-    @Override
-    public void createBroker() throws Exception
-    {
-        super.createBroker();
-        TransportConnection.createVMBroker(TransportConnection.DEFAULT_VM_PORT);
-    }
 
-    @Override
-    public void stopBroker()
-    {
-        TransportConnection.killVMBroker(TransportConnection.DEFAULT_VM_PORT);
-        super.stopBroker();
-    }
 
     /**
      * Test that the round robin method has the correct delays.
-     * The first connection to vm://:1 will work but the localhost connection should fail but the duration it takes
+     * The first connection will work but the localhost connection should fail but the duration it takes
      * to report the failure is what is being tested.
      *
-     * @throws URLSyntaxException
-     * @throws InterruptedException
-     * @throws JMSException
      */
-    public void testFailoverRoundRobinDelay() throws URLSyntaxException, InterruptedException, JMSException
+    public void testFailoverRoundRobinDelay() throws Exception
     {
-        //note: The VM broker has no connect delay and the default 1 retry
+        //note: The first broker has no connect delay and the default 1 retry
         //        while the tcp:localhost broker has 3 retries with a 2s connect delay
         String connectionString = "amqp://guest:guest@/test?brokerlist=" +
-                                  "'vm://:" + TransportConnection.DEFAULT_VM_PORT +
+                                  "'tcp://:" + getPort() +
                                   ";tcp://localhost:5670?connectdelay='2000',retries='3''";
 
         AMQConnectionURL url = new AMQConnectionURL(connectionString);
@@ -82,7 +66,9 @@ public class FailoverMethodTest extends 
 
             stopBroker();
 
-            _failoverComplete.await();
+            _failoverComplete.await(30, TimeUnit.SECONDS);
+            assertEquals("failoverLatch was not decremented in given timeframe",
+                    0, _failoverComplete.getCount());
 
             long end = System.currentTimeMillis();
 
@@ -109,10 +95,9 @@ public class FailoverMethodTest extends 
         }
     }
 
-    public void testFailoverSingleDelay() throws URLSyntaxException, AMQVMBrokerCreationException,
-                                                 InterruptedException, JMSException
+    public void testFailoverSingleDelay() throws Exception
     {
-        String connectionString = "amqp://guest:guest@/test?brokerlist='vm://:1?connectdelay='2000',retries='3''";
+        String connectionString = "amqp://guest:guest@/test?brokerlist='tcp://localhost:" + getPort() + "?connectdelay='2000',retries='3''";
 
         AMQConnectionURL url = new AMQConnectionURL(connectionString);
 
@@ -125,7 +110,9 @@ public class FailoverMethodTest extends 
 
             stopBroker();
 
-            _failoverComplete.await();
+            _failoverComplete.await(30, TimeUnit.SECONDS);
+            assertEquals("failoverLatch was not decremented in given timeframe",
+                    0, _failoverComplete.getCount());
 
             long end = System.currentTimeMillis();
 
@@ -157,6 +144,10 @@ public class FailoverMethodTest extends 
             _logger.debug("Received AMQDisconnectedException");
             _failoverComplete.countDown();
         }
+        else
+        {
+            _logger.error("Unexpected underlying exception", e.getLinkedException());
+        }
     }
 
     /**
@@ -165,17 +156,11 @@ public class FailoverMethodTest extends 
      *
      * Test validates that there is a connection delay as required on initial
      * connection.
-     *
-     * @throws URLSyntaxException
-     * @throws AMQVMBrokerCreationException
-     * @throws InterruptedException
-     * @throws JMSException
      */
-    public void testNoFailover() throws URLSyntaxException, AMQVMBrokerCreationException,
-                                        InterruptedException, JMSException
+    public void testNoFailover() throws Exception
     {
         int CONNECT_DELAY = 2000;
-        String connectionString = "amqp://guest:guest@/test?brokerlist='vm://:1?connectdelay='" + CONNECT_DELAY + "'," +
+        String connectionString = "amqp://guest:guest@/test?brokerlist='tcp://localhost:" + getPort() + "?connectdelay='" + CONNECT_DELAY + "'," +
                                   "retries='3'',failover='nofailover'";
 
         AMQConnectionURL url = new AMQConnectionURL(connectionString);
@@ -195,7 +180,7 @@ public class FailoverMethodTest extends 
                         //Wait before starting broker
                         // The wait should allow atleast 1 retries to fail before broker is ready
                         Thread.sleep(750);
-                        createBroker();
+                        startBroker();
                     }
                     catch (Exception e)
                     {
@@ -231,7 +216,9 @@ public class FailoverMethodTest extends 
             //Kill connection
             stopBroker();
 
-            _failoverComplete.await();
+            _failoverComplete.await(30, TimeUnit.SECONDS);
+            assertEquals("failoverLatch was not decremented in given timeframe",
+                    0, _failoverComplete.getCount());
 
             end = System.currentTimeMillis();
 

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java Thu Jul  7 15:16:33 2011
@@ -176,7 +176,7 @@ public class AlertingTest extends Abstra
 
         startBroker();
 
-        if (!isExternalBroker())
+        if (isInternalBroker())
         {
             assertEquals("Alert Max Msg Count is not correct", 5, ApplicationRegistry.getInstance().getVirtualHostRegistry().
                     getVirtualHost(VIRTUALHOST).getQueueRegistry().getQueue(new AMQShortString(_destination.getQueueName())).

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java Thu Jul  7 15:16:33 2011
@@ -77,7 +77,7 @@ public class ChannelLoggingTest extends 
         validateMessageID("CHN-1001", log);
         assertEquals("Incorrect Channel in actor:"+fromActor(log), isBroker010()? 0 : 1, getChannelID(fromActor(log)));
 
-        if (isBroker08())
+        if (!isBroker010())
         {
             // Wait to ensure that the CHN-1004 message is logged
             waitForMessage("CHN-1004");
@@ -89,7 +89,7 @@ public class ChannelLoggingTest extends 
             log = getLogMessage(results, 0);
             //  MESSAGE [con:0(guest@anonymous(3273383)/test)/ch:1] CHN-1004 : Prefetch Size (bytes) {0,number} : Count {1,number}
             validateMessageID("CHN-1004", log);
-            assertEquals("Incorrect Channel in actor:"+fromActor(log), isBroker010()? 0 : 1, getChannelID(fromActor(log)));
+            assertEquals("Incorrect Channel in actor:"+fromActor(log), 1, getChannelID(fromActor(log)));
             assertTrue("Prefetch Count not correct",getMessageString(fromMessage(log)).endsWith("Count "+PREFETCH));
         }
 

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java Thu Jul  7 15:16:33 2011
@@ -76,9 +76,8 @@ public class ManagementLoggingTest exten
      */
     public void testManagementStartupEnabled() throws Exception
     {
-        // This test only works on external java brokers due to the fact that
-        // Management is disabled on InVM brokers.
-        if (isJavaBroker() && isExternalBroker())
+        // This test only works on java brokers
+        if (isJavaBroker())
         {
             startBrokerAndCreateMonitor(true, false);
 
@@ -130,9 +129,7 @@ public class ManagementLoggingTest exten
      */
     public void testManagementStartupDisabled() throws Exception
     {
-        // This test only works on external java brokers due to the fact that
-        // Management is disabled on InVM brokers.
-        if (isJavaBroker() && isExternalBroker())
+        if (isJavaBroker())
         {
             startBrokerAndCreateMonitor(false, false);
 
@@ -191,9 +188,7 @@ public class ManagementLoggingTest exten
      */
     public void testManagementStartupRMIEntries() throws Exception
     {
-        // This test only works on external java brokers due to the fact that
-        // Management is disabled on InVM brokers.
-        if (isJavaBroker() && isExternalBroker())
+        if (isJavaBroker())
         {
             startBrokerAndCreateMonitor(true, false);
             
@@ -250,9 +245,7 @@ public class ManagementLoggingTest exten
      */
     public void testManagementStartupSSLKeystore() throws Exception
     {
-        // This test only works on external java brokers due to the fact that
-        // Management is disabled on InVM brokers.
-        if (isJavaBroker() && isExternalBroker())
+        if (isJavaBroker())
         {
             startBrokerAndCreateMonitor(true, true);
 

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java Thu Jul  7 15:16:33 2011
@@ -78,21 +78,10 @@ public class NoLocalAfterRecoveryTest ex
 
         BrokerDetails details = _connectionURL.getBrokerDetails(0);
 
-        // Due to the problem with SingleServer delaying on all connection
-        // attempts. So using a high retry value.
-        if (_brokerType.equals(VM))
-        {
-            // Local testing suggests InVM restart takes under a second
-            details.setProperty(BrokerDetails.OPTIONS_RETRY, "5");
-            details.setProperty(BrokerDetails.OPTIONS_CONNECT_DELAY, "200");
-        }
-        else
-        {
-            // This will attempt to failover for 3 seconds.
-            // Local testing suggests failover takes 2 seconds
-            details.setProperty(BrokerDetails.OPTIONS_RETRY, "10");
-            details.setProperty(BrokerDetails.OPTIONS_CONNECT_DELAY, "500");
-        }
+        // This will attempt to failover for 3 seconds.
+        // Local testing suggests failover takes 2 seconds
+        details.setProperty(BrokerDetails.OPTIONS_RETRY, "10");
+        details.setProperty(BrokerDetails.OPTIONS_CONNECT_DELAY, "500");
 
         super.setUp();        
     }

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java Thu Jul  7 15:16:33 2011
@@ -23,7 +23,6 @@ package org.apache.qpid.server.queue;
 import junit.framework.TestCase;
 import junit.framework.Assert;
 import org.apache.log4j.Logger;
-import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.AMQQueue;

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java Thu Jul  7 15:16:33 2011
@@ -85,12 +85,6 @@ public class FirewallConfigTest extends 
 
     public void testVhostAllowBrokerDeny() throws Exception
     {
-        if (_brokerType.equals(VM))
-        {
-            //No point running this test with an InVM broker as the
-            //firewall plugin only functions for TCP connections.
-            return;
-        }
 
         _configFile = new File(System.getProperty("QPID_HOME"), "etc/config-systests-firewall-2.xml");
         
@@ -125,13 +119,6 @@ public class FirewallConfigTest extends 
     
     public void testVhostDenyBrokerAllow() throws Exception
     {
-        if (_brokerType.equals(VM))
-        {
-            //No point running this test with an InVM broker as the
-            //firewall plugin only functions for TCP connections.
-            return;
-        }
-        
         _configFile = new File(System.getProperty("QPID_HOME"), "etc/config-systests-firewall-3.xml");
         
         super.setUp();
@@ -277,11 +264,6 @@ public class FirewallConfigTest extends 
 
     private void testFirewall(boolean initial, boolean inVhost, Runnable restartOrReload) throws Exception
     {
-        if (_brokerType.equals(VM))
-        {
-            // No point running this test in a vm broker
-            return;
-        }
         
         writeFirewallFile(initial, inVhost);
         setConfigurationProperty("management.enabled", String.valueOf(true));

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java?rev=1143874&r1=1143873&r2=1143874&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java Thu Jul  7 15:16:33 2011
@@ -52,7 +52,6 @@ public class SelectorTest extends QpidBr
     private AMQConnection _connection;
     private AMQDestination _destination;
     private int count;
-    public String _connectionString = "vm://:1";
     private static final String INVALID_SELECTOR = "Cost LIKE 5";
     CountDownLatch _responseLatch = new CountDownLatch(1);
 
@@ -314,31 +313,4 @@ public class SelectorTest extends QpidBr
         assertNull("Consumer2 should not receiver another message",consumer2.receive(1000));
     }
 
-    public static void main(String[] argv) throws Exception
-    {
-        SelectorTest test = new SelectorTest();
-        test._connectionString = (argv.length == 0) ? "localhost:3000" : argv[0];
-
-        try
-        {
-            while (true)
-            {
-                if (test._connectionString.contains("vm://:1"))
-                {
-                    test.setUp();
-                }
-                test.testUsingOnMessage();
-
-                if (test._connectionString.contains("vm://:1"))
-                {
-                    test.tearDown();
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            System.err.println(e.getMessage());
-            e.printStackTrace();
-        }
-    }
 }



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message