activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/2] activemq-artemis git commit: Fix activemq-unit-test failure -- added addConnector() method so new connector can be created for tests -- fix zero-byte key store files that cause test failures -- fix a invm issue in test
Date Thu, 09 Jul 2015 02:29:28 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 5b75f59bd -> e07c526f0


Fix activemq-unit-test failure
   -- added addConnector() method so new connector can be created for tests
   -- fix zero-byte key store files that cause test failures
   -- fix a invm issue in test


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f59b10ce
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f59b10ce
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f59b10ce

Branch: refs/heads/master
Commit: f59b10cea2186af9a49607e909e0467619b73258
Parents: 5b75f59
Author: gaohoward <hgao@redhat.com>
Authored: Thu Jul 9 09:10:15 2015 +0800
Committer: gaohoward <hgao@redhat.com>
Committed: Thu Jul 9 09:18:42 2015 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/activemq/broker/BrokerService.java   | 4 +++-
 .../activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java  | 7 +------
 .../src/test/java/org/apache/activemq/JmsTestSupport.java     | 2 +-
 tests/activemq5-unit-tests/src/test/resources/client.keystore | 0
 tests/activemq5-unit-tests/src/test/resources/server.keystore | 0
 5 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f59b10ce/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
index cf9c939..dd34769 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -431,7 +431,7 @@ public class BrokerService implements Service
 
    public TransportConnector addConnector(String bindAddress) throws Exception
    {
-      return null;
+      return addConnector(new URI(bindAddress));
    }
 
    public void setIoExceptionHandler(IOExceptionHandler ioExceptionHandler)
@@ -653,6 +653,8 @@ public class BrokerService implements Service
 
    public TransportConnector addConnector(URI bindAddress) throws Exception
    {
+      Integer port = bindAddress.getPort();
+      this.extraConnectors.add(port);
       return null;
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f59b10ce/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
index 69136fd..822faed 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
@@ -64,11 +64,6 @@ public class ArtemisBrokerWrapper extends ArtemisBrokerBase
       Set<TransportConfiguration> acceptors0 = serverConfig.getAcceptorConfigurations();
       Iterator<TransportConfiguration> iter0 = acceptors0.iterator();
 
-      while (iter0.hasNext())
-      {
-         System.out.println("===>: " + iter0.next());
-      }
-
       Map<String, AddressSettings> addressSettings = serverConfig.getAddressesSettings();
       String match = "jms.queue.#";
       AddressSettings dlaSettings = new AddressSettings();
@@ -168,7 +163,7 @@ public class ArtemisBrokerWrapper extends ArtemisBrokerBase
 
       while (iter.hasNext())
       {
-         System.out.println(">: " + iter.next());
+         System.out.println("acceptor =>: " + iter.next());
       }
       server.start();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f59b10ce/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTestSupport.java
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTestSupport.java
index 5531410..29d84c9 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTestSupport.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTestSupport.java
@@ -107,7 +107,7 @@ public class JmsTestSupport extends CombinationTestSupport {
     }
 
     protected ConnectionFactory createConnectionFactory() throws Exception {
-        return new ActiveMQConnectionFactory("vm://localhost");
+        return new ActiveMQConnectionFactory("tcp://localhost:61616");
     }
 
     protected BrokerService createBroker() throws Exception {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f59b10ce/tests/activemq5-unit-tests/src/test/resources/client.keystore
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/resources/client.keystore b/tests/activemq5-unit-tests/src/test/resources/client.keystore
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f59b10ce/tests/activemq5-unit-tests/src/test/resources/server.keystore
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/resources/server.keystore b/tests/activemq5-unit-tests/src/test/resources/server.keystore
old mode 100644
new mode 100755


Mime
View raw message