Repository: qpid-jms
Updated Branches:
  refs/heads/master b58538237 -> 939239c83


Use a VM connection for OpenWire connect and remove the OpenWire
TransportConnector, shaves a tiny bit off test setUp / tearDown

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/939239c8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/939239c8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/939239c8

Branch: refs/heads/master
Commit: 939239c8373d4bc1a89aaabce204bc31abc9396a
Parents: b585382
Author: Timothy Bish <[email protected]>
Authored: Thu Jan 29 11:15:33 2015 -0500
Committer: Timothy Bish <[email protected]>
Committed: Thu Jan 29 11:15:33 2015 -0500

----------------------------------------------------------------------
 .../apache/qpid/jms/support/QpidJmsTestSupport.java | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/939239c8/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
----------------------------------------------------------------------
diff --git 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
index 121b5ec..e1f07d5 100644
--- 
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
+++ 
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/QpidJmsTestSupport.java
@@ -129,8 +129,7 @@ public class QpidJmsTestSupport {
 
     public URI getBrokerActiveMQClientConnectionURI() {
         try {
-            return new URI("tcp://127.0.0.1:" +
-                
brokerService.getTransportConnectorByName("openwire").getPublishableConnectURI().getPort());
+            return new URI("vm://localhost");
         } catch (Exception e) {
             throw new RuntimeException();
         }
@@ -184,24 +183,11 @@ public class QpidJmsTestSupport {
             brokerService.setPlugins(plugins.toArray(array));
         }
 
-        addOpenWireConnector(brokerService, portMap);
         addAdditionalConnectors(brokerService, portMap);
 
         return brokerService;
     }
 
-    protected int addOpenWireConnector(BrokerService brokerService, 
Map<String, Integer> portMap) throws Exception {
-        int port = 0;
-        if (portMap.containsKey("openwire")) {
-            port = portMap.get("openwire");
-        }
-        TransportConnector connector = 
brokerService.addConnector("tcp://0.0.0.0:" + port + "?trace=true");
-        connector.setName("openwire");
-        int openwirePort = connector.getPublishableConnectURI().getPort();
-        LOG.debug("Using openwire port: {}", openwirePort);
-        return openwirePort;
-    }
-
     protected void addAdditionalConnectors(BrokerService brokerService, 
Map<String, Integer> portMap) throws Exception {
         // Subclasses can add their own connectors, we don't add any here.
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to