activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [2/2] activemq-artemis git commit: ARTEMIS-477 Fix Certificate Issues in openwire test also added a method impl to return a true uri instead of null.
Date Mon, 11 Apr 2016 20:56:08 GMT
ARTEMIS-477 Fix Certificate Issues in openwire test
also added a method impl to return a true uri instead of null.


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

Branch: refs/heads/master
Commit: 507193f714012e6cdc25ba10258a9f43daac5f3e
Parents: b2ede6a
Author: Howard Gao <howard.gao@gmail.com>
Authored: Mon Apr 11 22:52:16 2016 +0800
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Mon Apr 11 16:55:58 2016 -0400

----------------------------------------------------------------------
 .../apache/activemq/broker/BrokerService.java    |   7 +++++++
 .../src/test/java/client.keystore                | Bin 2197 -> 2237 bytes
 .../src/test/java/server.keystore                | Bin 2197 -> 2236 bytes
 .../src/test/resources/client.keystore           | Bin 2197 -> 2237 bytes
 .../src/test/resources/server.keystore           | Bin 2197 -> 2236 bytes
 5 files changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/507193f7/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 f72fe34..23fd584 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
@@ -367,6 +367,13 @@ public class BrokerService implements Service {
    }
 
    public URI getVmConnectorURI() {
+      try {
+         URI substituteUri = new URI("tcp://localhost:61616");
+         return substituteUri;
+      }
+      catch (URISyntaxException e) {
+         e.printStackTrace();
+      }
       return null;
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/507193f7/tests/activemq5-unit-tests/src/test/java/client.keystore
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/client.keystore b/tests/activemq5-unit-tests/src/test/java/client.keystore
old mode 100755
new mode 100644
index a96e55c..a6f3396
Binary files a/tests/activemq5-unit-tests/src/test/java/client.keystore and b/tests/activemq5-unit-tests/src/test/java/client.keystore
differ

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/507193f7/tests/activemq5-unit-tests/src/test/java/server.keystore
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/server.keystore b/tests/activemq5-unit-tests/src/test/java/server.keystore
old mode 100755
new mode 100644
index 0d549fc..f5a6760
Binary files a/tests/activemq5-unit-tests/src/test/java/server.keystore and b/tests/activemq5-unit-tests/src/test/java/server.keystore
differ

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/507193f7/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 100755
new mode 100644
index a96e55c..a6f3396
Binary files a/tests/activemq5-unit-tests/src/test/resources/client.keystore and b/tests/activemq5-unit-tests/src/test/resources/client.keystore
differ

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/507193f7/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 100755
new mode 100644
index 0d549fc..f5a6760
Binary files a/tests/activemq5-unit-tests/src/test/resources/server.keystore and b/tests/activemq5-unit-tests/src/test/resources/server.keystore
differ


Mime
View raw message