You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/05/04 20:55:19 UTC
[1/6] activemq-artemis git commit: Fix
ActiveMQServerControlUsingCoreTest
Repository: activemq-artemis
Updated Branches:
refs/heads/master bb8d095c1 -> 99acd6883
Fix ActiveMQServerControlUsingCoreTest
When using the "core" control some of the metrics change slightly and
those changes have to be accounted for in the tests.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/170d5c12
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/170d5c12
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/170d5c12
Branch: refs/heads/master
Commit: 170d5c12966173be71c9251e2a80ffb777025145
Parents: bb8d095
Author: jbertram <jb...@apache.org>
Authored: Wed May 4 14:12:02 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Wed May 4 14:12:22 2016 -0500
----------------------------------------------------------------------
.../management/ActiveMQServerControlTest.java | 14 +++++++++-----
.../ActiveMQServerControlUsingCoreTest.java | 4 ++++
2 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/170d5c12/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
index b66636a..4a9ca24 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
@@ -82,6 +82,10 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
// Public --------------------------------------------------------
+ public boolean usingCore() {
+ return false;
+ }
+
@Test
public void testGetAttributes() throws Exception {
ActiveMQServerControl serverControl = createManagementControl();
@@ -923,8 +927,8 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
createSessionFactory(locator).close();
}
- assertEquals(CONNECTION_COUNT, serverControl.getTotalConnectionCount());
- assertEquals(0, serverControl.getConnectionCount());
+ assertEquals(CONNECTION_COUNT + (usingCore() ? 1 : 0), serverControl.getTotalConnectionCount());
+ assertEquals(0 + (usingCore() ? 1 : 0), serverControl.getConnectionCount());
locator.close();
}
@@ -962,7 +966,7 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
session.commit();
assertEquals(2, serverControl.getTotalMessagesAdded());
- assertEquals(0, serverControl.getTotalMessageCount());
+ assertEquals(0 + (usingCore() ? 1 : 0), serverControl.getTotalMessageCount());
consumer1.close();
consumer2.close();
@@ -1008,7 +1012,7 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
session.commit();
assertEquals(2, serverControl.getTotalMessagesAcknowledged());
- assertEquals(0, serverControl.getTotalMessageCount());
+ assertEquals(0 + (usingCore() ? 1 : 0), serverControl.getTotalMessageCount());
consumer1.close();
consumer2.close();
@@ -1040,7 +1044,7 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
ClientConsumer consumer1 = session.createConsumer(random1);
ClientConsumer consumer2 = session.createConsumer(random2);
- assertEquals(2, serverControl.getTotalConsumerCount());
+ assertEquals(2 + (usingCore() ? 1 : 0), serverControl.getTotalConsumerCount());
assertEquals(1, queueControl1.getConsumerCount());
assertEquals(1, queueControl2.getConsumerCount());
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/170d5c12/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
index 7fb5a5b..e760b01 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
@@ -664,6 +664,10 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes
}
};
}
+
+ public boolean usingCore() {
+ return true;
+ }
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
[3/6] activemq-artemis git commit: Fix GroupIDTest failure
Posted by cl...@apache.org.
Fix GroupIDTest failure
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/89a0ffe1
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/89a0ffe1
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/89a0ffe1
Branch: refs/heads/master
Commit: 89a0ffe1b2df50167af98248a7837aeb1f3b3999
Parents: d36a22c
Author: jbertram <jb...@apache.org>
Authored: Wed May 4 15:16:51 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Wed May 4 15:16:51 2016 -0500
----------------------------------------------------------------------
.../activemq/artemis/tests/integration/jms/client/GroupingTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/89a0ffe1/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupingTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupingTest.java
index 751d673..295db6a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupingTest.java
@@ -121,6 +121,7 @@ public class GroupingTest extends JMSTestBase {
public void testGroupingWithJMS2Producer() throws Exception {
ConnectionFactory fact = getCF();
Assume.assumeFalse("only makes sense withOUT auto-group", ((ActiveMQConnectionFactory) fact).isAutoGroup());
+ Assume.assumeTrue("only makes sense withOUT explicit group-id", ((ActiveMQConnectionFactory) fact).getGroupID() == null);
final String groupID = UUID.randomUUID().toString();
JMSContext ctx = addContext(getCF().createContext(JMSContext.SESSION_TRANSACTED));
[2/6] activemq-artemis git commit: Fix AutoGroupingTest failure
Posted by cl...@apache.org.
Fix AutoGroupingTest failure
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d36a22c4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d36a22c4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d36a22c4
Branch: refs/heads/master
Commit: d36a22c4a7185a08ed5887e30705c2b263446892
Parents: 170d5c1
Author: jbertram <jb...@apache.org>
Authored: Wed May 4 15:14:32 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Wed May 4 15:14:32 2016 -0500
----------------------------------------------------------------------
.../artemis/tests/integration/jms/client/GroupingTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d36a22c4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupingTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupingTest.java
index a73e3e5..751d673 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/GroupingTest.java
@@ -119,6 +119,8 @@ public class GroupingTest extends JMSTestBase {
@Test
public void testGroupingWithJMS2Producer() throws Exception {
+ ConnectionFactory fact = getCF();
+ Assume.assumeFalse("only makes sense withOUT auto-group", ((ActiveMQConnectionFactory) fact).isAutoGroup());
final String groupID = UUID.randomUUID().toString();
JMSContext ctx = addContext(getCF().createContext(JMSContext.SESSION_TRANSACTED));
[5/6] activemq-artemis git commit: Fix
RaceOnSyncLargeMessageOverReplicationTest
Posted by cl...@apache.org.
Fix RaceOnSyncLargeMessageOverReplicationTest
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1d770e49
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1d770e49
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1d770e49
Branch: refs/heads/master
Commit: 1d770e49f00685e6da69c996928624981a9a740a
Parents: 500a734
Author: jbertram <jb...@apache.org>
Authored: Wed May 4 15:28:23 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Wed May 4 15:28:23 2016 -0500
----------------------------------------------------------------------
.../extras/byteman/RaceOnSyncLargeMessageOverReplicationTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1d770e49/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplicationTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplicationTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplicationTest.java
index 435f134..30fdcec 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplicationTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplicationTest.java
@@ -108,7 +108,7 @@ public class RaceOnSyncLargeMessageOverReplicationTest extends ActiveMQTestBase
connection = (ActiveMQConnection) factory.createConnection();
session = connection.createSession(true, Session.SESSION_TRANSACTED);
- queue = session.createQueue("jms.queue.Queue");
+ queue = session.createQueue("Queue");
producer = session.createProducer(queue);
}
[4/6] activemq-artemis git commit: Fix AutoDeleteJmsQueueTest
Posted by cl...@apache.org.
Fix AutoDeleteJmsQueueTest
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/500a734d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/500a734d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/500a734d
Branch: refs/heads/master
Commit: 500a734d047a3fb6445eff0fbb80c6b23593b21c
Parents: 89a0ffe
Author: jbertram <jb...@apache.org>
Authored: Wed May 4 15:26:59 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Wed May 4 15:26:59 2016 -0500
----------------------------------------------------------------------
.../artemis/jms/server/impl/JMSServerManagerImpl.java | 11 +++++++++--
.../activemq/artemis/core/server/ActiveMQServer.java | 7 +++++++
.../artemis/core/server/impl/ActiveMQServerImpl.java | 12 +++++++++++-
3 files changed, 27 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/500a734d/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
index 8fe181a..c9a1617 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
@@ -483,7 +483,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
public void runException() throws Exception {
checkBindings(bindings);
- if (internalCreateQueue(queueName, selectorString, durable)) {
+ if (internalCreateQueue(queueName, selectorString, durable, autoCreated)) {
ActiveMQDestination destination = queues.get(queueName);
if (destination == null) {
@@ -1047,6 +1047,13 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
private synchronized boolean internalCreateQueue(final String queueName,
final String selectorString,
final boolean durable) throws Exception {
+ return internalCreateQueue(queueName, selectorString, durable, false);
+ }
+
+ private synchronized boolean internalCreateQueue(final String queueName,
+ final String selectorString,
+ final boolean durable,
+ final boolean autoCreated) throws Exception {
if (queues.get(queueName) != null) {
return false;
}
@@ -1060,7 +1067,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
coreFilterString = SelectorTranslator.convertToActiveMQFilterString(selectorString);
}
- Queue queue = server.deployQueue(SimpleString.toSimpleString(activeMQQueue.getAddress()), SimpleString.toSimpleString(activeMQQueue.getAddress()), SimpleString.toSimpleString(coreFilterString), durable, false);
+ Queue queue = server.deployQueue(SimpleString.toSimpleString(activeMQQueue.getAddress()), SimpleString.toSimpleString(activeMQQueue.getAddress()), SimpleString.toSimpleString(coreFilterString), durable, false, autoCreated);
queues.put(queueName, activeMQQueue);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/500a734d/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
index 2b0e322..3719453 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
@@ -254,6 +254,13 @@ public interface ActiveMQServer extends ActiveMQComponent {
boolean durable,
boolean temporary) throws Exception;
+ Queue deployQueue(SimpleString address,
+ SimpleString queueName,
+ SimpleString filterString,
+ boolean durable,
+ boolean temporary,
+ boolean autoCreated) throws Exception;
+
Queue locateQueue(SimpleString queueName);
BindingQueryResult bindingQuery(SimpleString address) throws Exception;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/500a734d/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 29f2e7a..40a7b6c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -1406,6 +1406,16 @@ public class ActiveMQServerImpl implements ActiveMQServer {
final SimpleString filterString,
final boolean durable,
final boolean temporary) throws Exception {
+ return deployQueue(address, resourceName, filterString, durable, temporary, false);
+ }
+
+ @Override
+ public Queue deployQueue(final SimpleString address,
+ final SimpleString resourceName,
+ final SimpleString filterString,
+ final boolean durable,
+ final boolean temporary,
+ final boolean autoCreated) throws Exception {
if (resourceName.toString().toLowerCase().startsWith("jms.topic")) {
ActiveMQServerLogger.LOGGER.deployTopic(resourceName);
@@ -1414,7 +1424,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
ActiveMQServerLogger.LOGGER.deployQueue(resourceName);
}
- return createQueue(address, resourceName, filterString, null, durable, temporary, true, false, false);
+ return createQueue(address, resourceName, filterString, null, durable, temporary, true, false, autoCreated);
}
@Override
[6/6] activemq-artemis git commit: This closes #505
Posted by cl...@apache.org.
This closes #505
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/99acd688
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/99acd688
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/99acd688
Branch: refs/heads/master
Commit: 99acd688382a87f83e6a86960b2794f5cb3a3b9e
Parents: bb8d095 1d770e4
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed May 4 16:53:25 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed May 4 16:53:25 2016 -0400
----------------------------------------------------------------------
.../artemis/jms/server/impl/JMSServerManagerImpl.java | 11 +++++++++--
.../activemq/artemis/core/server/ActiveMQServer.java | 7 +++++++
.../artemis/core/server/impl/ActiveMQServerImpl.java | 12 +++++++++++-
.../RaceOnSyncLargeMessageOverReplicationTest.java | 2 +-
.../tests/integration/jms/client/GroupingTest.java | 3 +++
.../management/ActiveMQServerControlTest.java | 14 +++++++++-----
.../ActiveMQServerControlUsingCoreTest.java | 4 ++++
7 files changed, 44 insertions(+), 9 deletions(-)
----------------------------------------------------------------------