You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2016/08/09 10:24:33 UTC
[1/4] activemq-artemis git commit: This closes #708
Repository: activemq-artemis
Updated Branches:
refs/heads/master b86321995 -> 6b0c08901
This closes #708
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6b0c0890
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6b0c0890
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6b0c0890
Branch: refs/heads/master
Commit: 6b0c089017e69609e0394999c714bfb73901a18b
Parents: b863219 3aa6d34
Author: Martyn Taylor <mt...@redhat.com>
Authored: Tue Aug 9 11:24:22 2016 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Aug 9 11:24:22 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/activemq/artemis/utils/uri/URISupport.java | 1 -
artemis-distribution/src/main/resources/README.html | 2 +-
.../java/org/apache/activemq/artemis/jlibaio/LibaioFile.java | 1 +
.../protocol/proton/converter/message/InboundTransformer.java | 1 -
.../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 1 +
examples/features/ha/application-layer-failover/readme.html | 2 +-
examples/features/standard/jms-bridge/readme.html | 2 +-
.../failover/FailoverConsumerOutstandingCommitTest.java | 2 --
.../transport/failover/FailoverConsumerUnconsumedTest.java | 2 --
.../activemq/transport/failover/FailoverDuplicateTest.java | 1 -
.../activemq/transport/failover/FailoverPrefetchZeroTest.java | 1 -
.../activemq/transport/failover/FailoverTransactionTest.java | 4 ----
.../activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java | 1 -
.../activemq/usecases/TwoBrokerQueueClientsReconnectTest.java | 2 --
14 files changed, 5 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
[2/4] activemq-artemis git commit: Add missing @Override
Posted by ma...@apache.org.
Add missing @Override
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/abf94845
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/abf94845
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/abf94845
Branch: refs/heads/master
Commit: abf948457e72f1669dd3d2621097b1f6bcebc32f
Parents: 330c65b
Author: Ville Skytt� <vi...@iki.fi>
Authored: Tue Aug 9 11:38:17 2016 +0300
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Aug 9 11:24:22 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/activemq/artemis/jlibaio/LibaioFile.java | 1 +
.../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/abf94845/artemis-native/src/main/java/org/apache/activemq/artemis/jlibaio/LibaioFile.java
----------------------------------------------------------------------
diff --git a/artemis-native/src/main/java/org/apache/activemq/artemis/jlibaio/LibaioFile.java b/artemis-native/src/main/java/org/apache/activemq/artemis/jlibaio/LibaioFile.java
index b8134b9..92a6733 100644
--- a/artemis-native/src/main/java/org/apache/activemq/artemis/jlibaio/LibaioFile.java
+++ b/artemis-native/src/main/java/org/apache/activemq/artemis/jlibaio/LibaioFile.java
@@ -48,6 +48,7 @@ public final class LibaioFile<Callback extends SubmitInfo> implements AutoClosea
return LibaioContext.lock(fd);
}
+ @Override
public void close() throws IOException {
open = false;
LibaioContext.close(fd);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/abf94845/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 2a8bacf..058b938 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
@@ -2367,6 +2367,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
this.server = server;
}
+ @Override
public void run() {
try {
URL url = server.getConfiguration().getConfigurationUrl();
[4/4] activemq-artemis git commit: Remove unnecessary
@SuppressWarnings("unchecked")
Posted by ma...@apache.org.
Remove unnecessary @SuppressWarnings("unchecked")
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/330c65ba
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/330c65ba
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/330c65ba
Branch: refs/heads/master
Commit: 330c65ba356b328effaa777a01cccb767c0f4527
Parents: b863219
Author: Ville Skytt� <vi...@iki.fi>
Authored: Tue Aug 9 11:37:43 2016 +0300
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Aug 9 11:24:22 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/activemq/artemis/utils/uri/URISupport.java | 1 -
.../protocol/proton/converter/message/InboundTransformer.java | 1 -
.../failover/FailoverConsumerOutstandingCommitTest.java | 2 --
.../transport/failover/FailoverConsumerUnconsumedTest.java | 2 --
.../activemq/transport/failover/FailoverDuplicateTest.java | 1 -
.../activemq/transport/failover/FailoverPrefetchZeroTest.java | 1 -
.../activemq/transport/failover/FailoverTransactionTest.java | 4 ----
.../activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java | 1 -
.../activemq/usecases/TwoBrokerQueueClientsReconnectTest.java | 2 --
9 files changed, 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/330c65ba/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java
index b850de9..f3744f1 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java
@@ -217,7 +217,6 @@ public class URISupport {
return uri;
}
- @SuppressWarnings("unchecked")
private static Map<String, String> emptyMap() {
return Collections.EMPTY_MAP;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/330c65ba/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/InboundTransformer.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/InboundTransformer.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/InboundTransformer.java
index 9560ac1..a437e68 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/InboundTransformer.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/InboundTransformer.java
@@ -108,7 +108,6 @@ public abstract class InboundTransformer {
this.vendor = vendor;
}
- @SuppressWarnings("unchecked")
protected void populateMessage(Message jms, org.apache.qpid.proton.message.Message amqp) throws Exception {
Header header = amqp.getHeader();
if (header == null) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/330c65ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java
index 449600a..c31aba2 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java
@@ -91,7 +91,6 @@ public class FailoverConsumerOutstandingCommitTest extends OpenwireArtemisBaseTe
doTestFailoverConsumerDups(true);
}
- @SuppressWarnings("unchecked")
public void doTestFailoverConsumerDups(final boolean watchTopicAdvisories) throws Exception {
server = createBroker();
@@ -204,7 +203,6 @@ public class FailoverConsumerOutstandingCommitTest extends OpenwireArtemisBaseTe
doTestFailoverConsumerOutstandingSendTx(true);
}
- @SuppressWarnings("unchecked")
public void doTestFailoverConsumerOutstandingSendTx(final boolean doActualBrokerCommit) throws Exception {
final boolean watchTopicAdvisories = true;
server = createBroker();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/330c65ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
index 95e9021..05116a5 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
@@ -118,7 +118,6 @@ public class FailoverConsumerUnconsumedTest extends OpenwireArtemisBaseTest {
doTestFailoverConsumerDups(false);
}
- @SuppressWarnings("unchecked")
@Test
@BMRules(
rules = {
@@ -231,7 +230,6 @@ public class FailoverConsumerUnconsumedTest extends OpenwireArtemisBaseTest {
connection.close();
}
- @SuppressWarnings("unchecked")
public void doTestFailoverConsumerDups(final boolean watchTopicAdvisories) throws Exception {
maxConsumers = 4;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/330c65ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDuplicateTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDuplicateTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDuplicateTest.java
index 89ba1d7..e2654e7 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDuplicateTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverDuplicateTest.java
@@ -86,7 +86,6 @@ public class FailoverDuplicateTest extends OpenwireArtemisBaseTest {
factory.setOptimizeAcknowledge(true);
}
- @SuppressWarnings("unchecked")
@Test
@BMRules(
rules = {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/330c65ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java
index a262033..9596317 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java
@@ -71,7 +71,6 @@ public class FailoverPrefetchZeroTest extends OpenwireArtemisBaseTest {
broker.start();
}
- @SuppressWarnings("unchecked")
@Test
@BMRules(
rules = {@BMRule(
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/330c65ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
index 00ff4b5..1557854 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
@@ -220,7 +220,6 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
connection.close();
}
- @SuppressWarnings("unchecked")
@Test
public void testFailoverCommitReplyLostWithDestinationPathSeparator() throws Exception {
//the original test validates destinations using forward slash (/) as
@@ -230,7 +229,6 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
//Artemis doesn't support "/" so far and this test doesn't make sense therefore.
}
- @SuppressWarnings("unchecked")
@Test
@BMRules(
rules = {
@@ -316,7 +314,6 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
connection.close();
}
- @SuppressWarnings("unchecked")
@Test
@BMRules(
rules = {
@@ -550,7 +547,6 @@ public class FailoverTransactionTest extends OpenwireArtemisBaseTest {
// }
// }
//
- @SuppressWarnings("unchecked")
public void doTestFailoverConsumerAckLost(final int pauseSeconds) throws Exception {
broker = createBroker();
broker.start();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/330c65ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java
index 642379f..dd398aa 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java
@@ -85,7 +85,6 @@ public class BrokerQueueNetworkWithDisconnectTest extends JmsMultipleBrokersTest
" must be received, duplicates are expected, count=" + msgs.getMessageCount(), MESSAGE_COUNT <= msgs.getMessageCount());
}
- @SuppressWarnings("unchecked")
public void testNoStuckConnectionsWithTransportDisconnect() throws Exception {
inactiveDuration = 60000L;
useDuplexNetworkBridge = true;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/330c65ba/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java
index cafc701..0e9ff3e 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java
@@ -366,7 +366,6 @@ public class TwoBrokerQueueClientsReconnectTest extends JmsMultipleBrokersTestSu
assertEquals("Client for " + broker2 + " should have received 50% of the messages.", (int) (MESSAGE_COUNT * 0.50), msgsClient2);
}
- @SuppressWarnings("unchecked")
public void testDuplicateSend() throws Exception {
broker1 = "BrokerA";
broker2 = "BrokerB";
@@ -441,7 +440,6 @@ public class TwoBrokerQueueClientsReconnectTest extends JmsMultipleBrokersTestSu
}));
}
- @SuppressWarnings("unchecked")
public void testDuplicateSendWithNoAuditEnqueueCountStat() throws Exception {
broker1 = "BrokerA";
broker2 = "BrokerB";
[3/4] activemq-artemis git commit: Spelling fixes
Posted by ma...@apache.org.
Spelling fixes
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3aa6d34e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3aa6d34e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3aa6d34e
Branch: refs/heads/master
Commit: 3aa6d34e3d51d5a3ff6dff70342ef0554632260f
Parents: abf9484
Author: Ville Skytt� <vi...@iki.fi>
Authored: Tue Aug 9 11:42:24 2016 +0300
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Aug 9 11:24:22 2016 +0100
----------------------------------------------------------------------
artemis-distribution/src/main/resources/README.html | 2 +-
examples/features/ha/application-layer-failover/readme.html | 2 +-
examples/features/standard/jms-bridge/readme.html | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3aa6d34e/artemis-distribution/src/main/resources/README.html
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/main/resources/README.html b/artemis-distribution/src/main/resources/README.html
index b708568..d9fb198 100644
--- a/artemis-distribution/src/main/resources/README.html
+++ b/artemis-distribution/src/main/resources/README.html
@@ -97,7 +97,7 @@ e.g.<br><br>
$ ./artemis run --config xml:/home/artemis/bootstrap.xml<br><br>
-It is possible to configure run time paramters in the artemis.conf (artemis.conf.bat for windows) file under the "bin" directory of the broker directory.
+It is possible to configure run time parameters in the artemis.conf (artemis.conf.bat for windows) file under the "bin" directory of the broker directory.
<h2>Stopping the Broker</h2>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3aa6d34e/examples/features/ha/application-layer-failover/readme.html
----------------------------------------------------------------------
diff --git a/examples/features/ha/application-layer-failover/readme.html b/examples/features/ha/application-layer-failover/readme.html
index b60a66d..c5248aa 100644
--- a/examples/features/ha/application-layer-failover/readme.html
+++ b/examples/features/ha/application-layer-failover/readme.html
@@ -36,7 +36,7 @@ under the License.
This listener will then be called by ActiveMQ Artemis in the event that connection failure is detected.</p>
<p>User code in the ExceptionListener can then recreate any JMS Connection, Session, etc on another node and the application
can continue.</p>
- <p>Application-Layer failover is an alternative approach to High Availabilty (HA).</p>
+ <p>Application-Layer failover is an alternative approach to High Availability (HA).</p>
<p>Application-Layer failover differs from automatic failover in that some client side coding is required in order
to implement this. Also, with Application-Layer failover, since the old Session object dies and a new is created, any uncommitted
work in the old Session will be lost, and any unacknowledged messages might be redelivered.</p>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3aa6d34e/examples/features/standard/jms-bridge/readme.html
----------------------------------------------------------------------
diff --git a/examples/features/standard/jms-bridge/readme.html b/examples/features/standard/jms-bridge/readme.html
index 1ee0ff6..182f7fa 100644
--- a/examples/features/standard/jms-bridge/readme.html
+++ b/examples/features/standard/jms-bridge/readme.html
@@ -48,7 +48,7 @@ under the License.
</ol>
<h3>JMS Bridge Configuration</h3>
<p>The JMS Bridge is a <abbr title="Plain Old Java Object">POJO</abbr> that we configure with both source and target
- JNDI configurations. In the actual example we are programatically creating the Bridge, however the following section
+ JNDI configurations. In the actual example we are programmatically creating the Bridge, however the following section
describes how you would do this if you wanted to deploy with an actual ActiveMQ Artemis server via the activemq-beans.xml.
<h4>Configuring the Bridge with the JBoss Microcontainer</h4>