You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/12/09 00:56:24 UTC

[1/4] activemq-artemis git commit: Fix SimpleOpenWireTest

Repository: activemq-artemis
Updated Branches:
  refs/heads/ARTEMIS-780 5454ef6c4 -> fd5352543


Fix SimpleOpenWireTest


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

Branch: refs/heads/ARTEMIS-780
Commit: 619420fc4a0ff8bd7d477e47d4acc99e11d60ee0
Parents: 5454ef6
Author: jbertram <jb...@apache.com>
Authored: Thu Dec 8 18:29:41 2016 -0600
Committer: jbertram <jb...@apache.com>
Committed: Thu Dec 8 18:29:41 2016 -0600

----------------------------------------------------------------------
 .../tests/integration/openwire/SimpleOpenWireTest.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/619420fc/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
index a6bb55f..01133b5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
@@ -574,7 +574,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest {
       Connection exConn = null;
 
       SimpleString durableQueue = new SimpleString("exampleQueue");
-      this.server.createQueue(durableQueue, durableQueue, null, true, false);
+      this.server.createQueue(durableQueue, RoutingType.ANYCAST, durableQueue, null, true, false, -1, false, true);
 
       try {
          ActiveMQConnectionFactory exFact = new ActiveMQConnectionFactory();
@@ -616,7 +616,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest {
       Connection exConn = null;
 
       SimpleString durableQueue = new SimpleString("exampleQueue");
-      this.server.createQueue(durableQueue, durableQueue, null, true, false);
+      this.server.createQueue(durableQueue, RoutingType.ANYCAST, durableQueue, null, true, false, -1, false, true);
 
       try {
          ActiveMQConnectionFactory exFact = new ActiveMQConnectionFactory();
@@ -653,7 +653,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest {
       Connection openConn = null;
 
       SimpleString durableQueue = new SimpleString("exampleQueue");
-      this.server.createQueue(durableQueue, durableQueue, null, true, false);
+      this.server.createQueue(durableQueue, RoutingType.ANYCAST, durableQueue, null, true, false, -1, false, true);
 
       ActiveMQConnectionFactory openCF = new ActiveMQConnectionFactory();
 
@@ -693,7 +693,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest {
       Connection conn1 = null;
 
       SimpleString durableQueue = new SimpleString("exampleQueue");
-      this.server.createQueue(durableQueue, RoutingType.ANYCAST, durableQueue, null, true, false);
+      this.server.createQueue(durableQueue, RoutingType.ANYCAST, durableQueue, null, true, false, -1, false, true);
 
       Queue queue = ActiveMQJMSClient.createQueue("exampleQueue");
 


[3/4] activemq-artemis git commit: Fix MessageListenerRedeliveryTest

Posted by jb...@apache.org.
Fix MessageListenerRedeliveryTest


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

Branch: refs/heads/ARTEMIS-780
Commit: 70704f7ba43a2e5a15c1cb2e4a2c133b19677e4b
Parents: 0496a2f
Author: jbertram <jb...@apache.com>
Authored: Thu Dec 8 18:33:43 2016 -0600
Committer: jbertram <jb...@apache.com>
Committed: Thu Dec 8 18:33:43 2016 -0600

----------------------------------------------------------------------
 .../artemis/tests/integration/openwire/BasicOpenWireTest.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/70704f7b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java
index 41e7959..6be92f8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java
@@ -139,7 +139,7 @@ public class BasicOpenWireTest extends OpenWireTestBase {
       SimpleString coreQ = testQueues.get(qname);
       if (coreQ == null) {
          coreQ = new SimpleString(qname);
-         this.server.createQueue(coreQ, RoutingType.ANYCAST, coreQ, null, false, false);
+         this.server.createQueue(coreQ, RoutingType.ANYCAST, coreQ, null, false, false, -1, false, true);
          testQueues.put(qname, coreQ);
       }
    }


[4/4] activemq-artemis git commit: Fix ArtemisTest

Posted by jb...@apache.org.
Fix ArtemisTest


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

Branch: refs/heads/ARTEMIS-780
Commit: fd53525430bc39848e13fd93dbc9f055626fc623
Parents: 70704f7
Author: jbertram <jb...@apache.com>
Authored: Thu Dec 8 18:55:50 2016 -0600
Committer: jbertram <jb...@apache.com>
Committed: Thu Dec 8 18:55:50 2016 -0600

----------------------------------------------------------------------
 .../src/test/java/org/apache/activemq/cli/test/ArtemisTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fd535254/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
index 85d194a..af5aaae 100644
--- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
+++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
@@ -621,7 +621,7 @@ public class ArtemisTest {
 
       // This is usually set when run from the command line via artemis.profile
       Run.setEmbedded(true);
-      Artemis.main("create", instanceFolder.getAbsolutePath(), "--force", "--silent", "--no-web", "--queues", queues, "--topics", topics, "--no-autotune", "--require-login", "--ping", "127.0.0.1");
+      Artemis.main("create", instanceFolder.getAbsolutePath(), "--force", "--silent", "--no-web", "--queues", queues, "--addresses", topics, "--no-autotune", "--require-login", "--ping", "127.0.0.1");
       System.setProperty("artemis.instance", instanceFolder.getAbsolutePath());
 
       FileConfiguration fc = new FileConfiguration();


[2/4] activemq-artemis git commit: Fix VerySimpleOpenwireTest

Posted by jb...@apache.org.
Fix VerySimpleOpenwireTest


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

Branch: refs/heads/ARTEMIS-780
Commit: 0496a2f3198501a558099d1a1070c40c7fe5706f
Parents: 619420f
Author: jbertram <jb...@apache.com>
Authored: Thu Dec 8 18:30:37 2016 -0600
Committer: jbertram <jb...@apache.com>
Committed: Thu Dec 8 18:30:37 2016 -0600

----------------------------------------------------------------------
 .../tests/integration/openwire/VerySimpleOenwireTest.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0496a2f3/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/VerySimpleOenwireTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/VerySimpleOenwireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/VerySimpleOenwireTest.java
index bddaef5..95affde 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/VerySimpleOenwireTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/VerySimpleOenwireTest.java
@@ -26,6 +26,7 @@ import javax.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.server.RoutingType;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.junit.Test;
 
@@ -42,7 +43,7 @@ public class VerySimpleOenwireTest extends OpenWireTestBase {
       Connection exConn = null;
 
       SimpleString durableQueue = new SimpleString("exampleQueue");
-      this.server.createQueue(durableQueue, durableQueue, null, true, false);
+      this.server.createQueue(durableQueue, RoutingType.ANYCAST, durableQueue, null, true, false, -1, false, true);
 
       try {
          ActiveMQConnectionFactory exFact = new ActiveMQConnectionFactory();
@@ -79,7 +80,7 @@ public class VerySimpleOenwireTest extends OpenWireTestBase {
       Connection openConn = null;
 
       SimpleString durableQueue = new SimpleString("exampleQueue");
-      this.server.createQueue(durableQueue, durableQueue, null, true, false);
+      this.server.createQueue(durableQueue, RoutingType.ANYCAST, durableQueue, null, true, false, -1, false, true);
 
       ActiveMQConnectionFactory openCF = new ActiveMQConnectionFactory();