svn commit: r1004568 - in /websites/production/activemq/content: apache-activemq-board-report-201701-january.html cache/main.pageCache
Author: buildbot Date: Mon Jan 9 22:22:48 2017 New Revision: 1004568 Log: Production update by buildbot for activemq Modified: websites/production/activemq/content/apache-activemq-board-report-201701-january.html websites/production/activemq/content/cache/main.pageCache Modified: websites/production/activemq/content/apache-activemq-board-report-201701-january.html == --- websites/production/activemq/content/apache-activemq-board-report-201701-january.html (original) +++ websites/production/activemq/content/apache-activemq-board-report-201701-january.html Mon Jan 9 22:22:48 2017 @@ -72,7 +72,7 @@ -DescriptionApache ActiveMQ is a popular and powerful open source message-oriented middleware. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 2.0, AMQP 1.0, MQTT, Stomp and REST.ActivityActiveMQTODOActiveMQ ArtemisApache Artemis 1.5.0 released with follow up of 1.5.1 maintenance release. Highlight s:Outgoing AMQP connections supportedThe ability to broker to detect network failures was addedCDI Integration was addedApache Artemis 2.0.0 is planned which includes major overhaul of the Artemis addressing modelNew model has been proposed and implemented, highlights include:Better support for address naming across protocols addedAbility to define prefixes for specifying pub/sub and point to point messaging requirements addedConsolidation of JMS and other protoco l management/configurationPMC changesCurrently 23 PMC membersClebert Suconic was added to the PMC on Thu Oct 27 2016Committer base changesCurrently 58 committersChristian Schneider was added as a committer on Wed Jan 04 2017Releases5.13.5 was released on Mon Dec 19 20165.14.2 was released on Wed Dec 07 20165.14.3 was released on Wed Dec 21 2016ActiveMQ Artemis 1.5.0 was released on Mon Nov 07 2016ActiveMQ Artemis 1.5.1 was released on Thu Dec 08 2016 (Most of this information is pulled from https://reporter.apache.org/;>reporter.apache.org) +DescriptionApache ActiveMQ is a popular and powerful open source message-oriented middleware. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 2.0, AMQP 1.0, MQTT, Stomp and REST.ActivityActiveMQContinued hardening of AMQP protocol supportFixes to some memory leaks and deadlocks addedLatest release now supports Jetty releases in the 9.3.x family.ActiveMQ ArtemisApache Artemis 1.5.0 released with follow up of 1.5.1 maintenance release. Highlights:Outgoing AMQP connections supportedThe ability to broker to detect network failures was addedCDI Integration was addedApache Artemis 2.0.0 is planned which includes major overhaul of the Artemis addressing modelNew model has been proposed and implemented, highlights include:Better support for address naming across protocols addedAbility to define prefixes for specifying pub/sub and point to point messaging requirements addedConsolidation of JMS and other protocol management/configurationBoth projects are now base-lined on Java 8Begin blogging about the ActiveMQ project onhttps://blogs.apache.org/;>https://blogs.apache.org/PMC changesCurrently 23 PMC membersClebert Suconic was added to the PMC on Thu Oct 27 2016Committer base changesCurrently 58 committersChristian Schneider was added as a committer on Wed Jan 04 2017Releases5.13.5 was released on Mon Dec 19 20165.14.2 was released on Wed Dec 07 20165.14.3 was released on Wed Dec 21 2016ActiveMQ Artemis 1.5.0 was released on Mon Nov 07 2016ActiveMQ Artemis 1.5.1 was released on Thu Dec 08 2016 (Most of this information is pulled from https://reporter.apache.org/;>reporter.apache.org) Modified: websites/production/activemq/content/cache/main.pageCache == Binary files - no diff available.
[CONF] Apache ActiveMQ > Apache ActiveMQ Board Report - 2017.01 (January)
Title: Message Title Bruce Snyder edited a page Apache ActiveMQ Board Report - 2017.01 (January) ... ActiveMQ Continued hardening of AMQP Protocol protocol support Fixes to some memory leaks and deadlocks added Latest release now supports Jetty releases in the 9.3.x family. ActiveMQ Artemis Apache Artemis 1.5.0 released with follow up of 1.5.1 maintenance release. Highlights: Outgoing AMQP connections supported The ability to broker to detect network failures was added CDI Integration was added Apache Artemis 2.0.0 is planned which includes major overhaul of the Artemis addressing model New model has been proposed and implemented, highlights include: Better support for address naming across protocols added Ability to define prefixes for specifying pub/sub and point to point messaging requirements added Consolidation of JMS and other protocol management/configuration Both projects are now base-lined on Java 8 Begin blogging about the ActiveMQ project on https://blogs.apache.org/ PMC changes Currently 23 PMC members Clebert Suconic was added to the PMC on Thu Oct 27 2016 ... View page • Like Stop watching space • Manage notifications This message was sent by Atlassian Confluence 5.8.4
[1/2] activemq-artemis git commit: This closes #953
Repository: activemq-artemis Updated Branches: refs/heads/master 57de21875 -> 0386263c8 This closes #953 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0386263c Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0386263c Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0386263c Branch: refs/heads/master Commit: 0386263c83a3de33fc392bf30eb0d67115c5aac1 Parents: 57de218 355d33e Author: Clebert SuconicAuthored: Mon Jan 9 14:58:25 2017 -0500 Committer: Clebert Suconic Committed: Mon Jan 9 14:58:25 2017 -0500 -- .../artemis/protocol/amqp/proton/handler/ProtonHandler.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] activemq-artemis git commit: fix log trace message throwing exception
fix log trace message throwing exception Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/355d33ea Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/355d33ea Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/355d33ea Branch: refs/heads/master Commit: 355d33ea4f26c492d244e5ba50ddadb52289fb84 Parents: 57de218 Author: Andy TaylorAuthored: Mon Jan 9 17:32:44 2017 + Committer: Clebert Suconic Committed: Mon Jan 9 14:58:25 2017 -0500 -- .../artemis/protocol/amqp/proton/handler/ProtonHandler.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/355d33ea/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java -- diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java index 71cf4a3..25ef51e 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java @@ -289,7 +289,7 @@ public class ProtonHandler extends ProtonInitializable { serverSasl.recv(dataSASL, 0, dataSASL.length); if (log.isTraceEnabled()) { - log.trace("Working on sasl::" + ByteUtil.bytesToHex(dataSASL, 2)); + log.trace("Working on sasl::" + (dataSASL != null && dataSASL.length > 0 ? ByteUtil.bytesToHex(dataSASL, 2) : "Anonymous")); } saslResult = mechanism.processSASL(dataSASL);
activemq-artemis git commit: ARTEMIS-913 Slow consumer detection not working when paging
Repository: activemq-artemis Updated Branches: refs/heads/1.x 6d022d035 -> 2a485602f ARTEMIS-913 Slow consumer detection not working when paging (cherry picked from commit 9f9ffc1ff59de16e356c3dd2f482535a017d4787) Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2a485602 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2a485602 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2a485602 Branch: refs/heads/1.x Commit: 2a485602fe57814ff5e9ea0911b04c2e10a41d5b Parents: 6d022d0 Author: Clebert SuconicAuthored: Mon Jan 9 12:34:13 2017 -0500 Committer: Clebert Suconic Committed: Mon Jan 9 12:35:10 2017 -0500 -- .../core/protocol/core/impl/PacketDecoder.java | 5 + .../artemis/core/server/impl/QueueImpl.java | 5 +- .../integration/client/SlowConsumerTest.java| 169 ++- 3 files changed, 59 insertions(+), 120 deletions(-) -- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2a485602/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java -- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java index 54c2022..ff6b9dd 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java @@ -32,6 +32,7 @@ import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSess import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSharedQueueMessage; import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.DisconnectConsumerMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.DisconnectConsumerWithKillMessage; import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.DisconnectMessage; import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.DisconnectMessage_V2; import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.NullResponseMessage; @@ -415,6 +416,10 @@ public abstract class PacketDecoder implements Serializable { packet = new CheckFailoverReplyMessage(); break; } + case PacketImpl.DISCONNECT_CONSUMER_KILL: { +packet = new DisconnectConsumerWithKillMessage(); +break; + } default: { throw ActiveMQClientMessageBundle.BUNDLE.invalidType(packetType); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2a485602/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java -- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java index e01c81e..27fd543 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java @@ -2723,12 +2723,13 @@ public class QueueImpl implements Queue { @Override public float getRate() { + long locaMessageAdded = getMessagesAdded(); float timeSlice = ((System.currentTimeMillis() - queueRateCheckTime.getAndSet(System.currentTimeMillis())) / 1000.0f); if (timeSlice == 0) { - messagesAddedSnapshot.getAndSet(messagesAdded); + messagesAddedSnapshot.getAndSet(locaMessageAdded); return 0.0f; } - return BigDecimal.valueOf((messagesAdded - messagesAddedSnapshot.getAndSet(messagesAdded)) / timeSlice).setScale(2, BigDecimal.ROUND_UP).floatValue(); + return BigDecimal.valueOf((locaMessageAdded - messagesAddedSnapshot.getAndSet(locaMessageAdded)) / timeSlice).setScale(2, BigDecimal.ROUND_UP).floatValue(); } // Inner classes http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2a485602/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java -- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
svn commit: r1004556 - in /websites/production/activemq/content: apache-activemq-board-report-201701-january.html cache/main.pageCache
Author: buildbot Date: Mon Jan 9 19:25:37 2017 New Revision: 1004556 Log: Production update by buildbot for activemq Modified: websites/production/activemq/content/apache-activemq-board-report-201701-january.html websites/production/activemq/content/cache/main.pageCache Modified: websites/production/activemq/content/apache-activemq-board-report-201701-january.html == --- websites/production/activemq/content/apache-activemq-board-report-201701-january.html (original) +++ websites/production/activemq/content/apache-activemq-board-report-201701-january.html Mon Jan 9 19:25:37 2017 @@ -72,7 +72,7 @@ -DescriptionApache ActiveMQ is a popular and powerful open source message-oriented middleware. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 2.0, AMQP 1.0, MQTT, Stomp and REST.ActivityTODO(Most of this information is pulled from https://reporter.apache.org/;>reporter.apache.org) +DescriptionApache ActiveMQ is a popular and powerful open source message-oriented middleware. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 2.0, AMQP 1.0, MQTT, Stomp and REST.ActivityActiveMQTODOActiveMQ ArtemisApache Artemis 1.5.0 released with follow up of 1.5.1 maintenance release. Highlight s:Outgoing AMQP connections supportedThe ability to broker to detect network failures was addedCDI Integration was addedApache Artemis 2.0.0 is planned which includes major overhaul of the Artemis addressing modelNew model has been proposed and implemented, highlights include:Better support for address naming across protocols addedAbility to define prefixes for specifying pub/sub and point to point messaging requirements addedConsolidation of JMS and other protoco l management/configurationPMC changesCurrently 23 PMC membersClebert Suconic was added to the PMC on Thu Oct 27 2016Committer base changesCurrently 58 committersChristian Schneider was added as a committer on Wed Jan 04 2017Releases5.13.5 was released on Mon Dec 19 20165.14.2 was released on Wed Dec 07 20165.14.3 was released on Wed Dec 21 2016ActiveMQ Artemis 1.5.0 was released on Mon Nov 07 2016ActiveMQ Artemis 1.5.1 was released on Thu Dec 08 2016 (Most of this information is pulled from https://reporter.apache.org/;>reporter.apache.org) Modified: websites/production/activemq/content/cache/main.pageCache == Binary files - no diff available.
[1/2] activemq-artemis git commit: ARTEMIS-913 Slow consumer detection not working when paging
Repository: activemq-artemis Updated Branches: refs/heads/master ced0e9c86 -> 57de21875 ARTEMIS-913 Slow consumer detection not working when paging Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/9f9ffc1f Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/9f9ffc1f Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/9f9ffc1f Branch: refs/heads/master Commit: 9f9ffc1ff59de16e356c3dd2f482535a017d4787 Parents: ced0e9c Author: Clebert SuconicAuthored: Mon Jan 9 12:34:13 2017 -0500 Committer: Clebert Suconic Committed: Mon Jan 9 12:34:13 2017 -0500 -- .../core/protocol/core/impl/PacketDecoder.java | 5 + .../artemis/core/server/impl/QueueImpl.java | 5 +- .../integration/client/SlowConsumerTest.java| 169 ++- 3 files changed, 59 insertions(+), 120 deletions(-) -- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9f9ffc1f/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java -- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java index d7f243a..e39e16b 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketDecoder.java @@ -35,6 +35,7 @@ import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSess import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSharedQueueMessage; import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSharedQueueMessage_V2; import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.DisconnectConsumerMessage; +import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.DisconnectConsumerWithKillMessage; import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.DisconnectMessage; import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.DisconnectMessage_V2; import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.NullResponseMessage; @@ -445,6 +446,10 @@ public abstract class PacketDecoder implements Serializable { packet = new CheckFailoverReplyMessage(); break; } + case PacketImpl.DISCONNECT_CONSUMER_KILL: { +packet = new DisconnectConsumerWithKillMessage(); +break; + } default: { throw ActiveMQClientMessageBundle.BUNDLE.invalidType(packetType); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9f9ffc1f/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java -- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java index 3caa22c..a74b0fe 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java @@ -2813,12 +2813,13 @@ public class QueueImpl implements Queue { @Override public float getRate() { + long locaMessageAdded = getMessagesAdded(); float timeSlice = ((System.currentTimeMillis() - queueRateCheckTime.getAndSet(System.currentTimeMillis())) / 1000.0f); if (timeSlice == 0) { - messagesAddedSnapshot.getAndSet(messagesAdded); + messagesAddedSnapshot.getAndSet(locaMessageAdded); return 0.0f; } - return BigDecimal.valueOf((messagesAdded - messagesAddedSnapshot.getAndSet(messagesAdded)) / timeSlice).setScale(2, BigDecimal.ROUND_UP).floatValue(); + return BigDecimal.valueOf((locaMessageAdded - messagesAddedSnapshot.getAndSet(locaMessageAdded)) / timeSlice).setScale(2, BigDecimal.ROUND_UP).floatValue(); } // Inner classes http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9f9ffc1f/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java -- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
[2/2] activemq-artemis git commit: This closes #954
This closes #954 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/57de2187 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/57de2187 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/57de2187 Branch: refs/heads/master Commit: 57de21875a1a63b2485a712b20e0f629aff5714c Parents: ced0e9c 9f9ffc1 Author: Justin BertramAuthored: Mon Jan 9 13:22:36 2017 -0600 Committer: Justin Bertram Committed: Mon Jan 9 13:22:36 2017 -0600 -- .../core/protocol/core/impl/PacketDecoder.java | 5 + .../artemis/core/server/impl/QueueImpl.java | 5 +- .../integration/client/SlowConsumerTest.java| 169 ++- 3 files changed, 59 insertions(+), 120 deletions(-) --
[CONF] Apache ActiveMQ > Apache ActiveMQ Board Report - 2017.01 (January)
Title: Message Title Martyn Taylor edited a page Apache ActiveMQ Board Report - 2017.01 (January) ... Apache ActiveMQ is a popular and powerful open source message-oriented middleware. Apache ActiveMQ is fast, supports many cross language clients and protocols, comes with easy to use enterprise integration patterns and many advanced features while fully supporting JMS 2.0, AMQP 1.0, MQTT, Stomp and REST. Activity ActiveMQ TODO ActiveMQ Artemis Apache Artemis 1.5.0 released with follow up of 1.5.1 maintenance release. Highlights: Outgoing AMQP connections supported The ability to broker to detect network failures was added CDI Integration was added Apache Artemis 2.0.0 is planned which includes major overhaul of the Artemis addressing model New model has been proposed and implemented, highlights include: Better support for address naming across protocols added Ability to define prefixes for specifying pub/sub and point to point messaging requirements added Consolidation of JMS and other protocol management/configuration (Most of this information is pulled from reporter.apache.org) View page • Like Stop watching space • Manage notifications This message was sent by Atlassian Confluence 5.8.4
[2/2] activemq-artemis git commit: ARTEMIS-899 don't log stack trace on authn failure
ARTEMIS-899 don't log stack trace on authn 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/f1d67df5 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f1d67df5 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f1d67df5 Branch: refs/heads/master Commit: f1d67df5e69737ca26cb65686b87391fbda9eadc Parents: 2eb5198 Author: Justin BertramAuthored: Fri Jan 6 15:32:52 2017 -0600 Committer: Clebert Suconic Committed: Mon Jan 9 12:17:48 2017 -0500 -- .../protocol/core/impl/ActiveMQPacketHandler.java | 4 .../artemis/core/server/ActiveMQServerLogger.java | 4 .../security/jaas/CertificateLoginModule.java | 2 +- .../spi/core/security/jaas/LDAPLoginModule.java | 1 - .../core/security/jaas/PropertiesLoginModule.java | 18 +++--- 5 files changed, 16 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f1d67df5/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQPacketHandler.java -- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQPacketHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQPacketHandler.java index 31ab624..d4a10c4 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQPacketHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQPacketHandler.java @@ -22,6 +22,7 @@ import java.util.Map; import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException; +import org.apache.activemq.artemis.api.core.ActiveMQSecurityException; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.persistence.OperationContext; import org.apache.activemq.artemis.core.protocol.core.Channel; @@ -174,6 +175,9 @@ public class ActiveMQPacketHandler implements ChannelHandler { protocolManager.addSessionHandler(request.getName(), handler); response = new CreateSessionResponseMessage(server.getVersion().getIncrementingVersion()); + } catch (ActiveMQSecurityException e) { + ActiveMQServerLogger.LOGGER.securityProblemWhileCreatingSession(e.getMessage()); + response = new ActiveMQExceptionMessage(e); } catch (ActiveMQException e) { if (e.getType() == ActiveMQExceptionType.INCOMPATIBLE_CLIENT_SERVER_VERSIONS) { incompatibleVersion = true; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f1d67df5/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java -- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java index 564aabd..b52ed24 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java @@ -1283,6 +1283,10 @@ public interface ActiveMQServerLogger extends BasicLogger { format = Message.Format.MESSAGE_FORMAT) void negativeGlobalAddressSize(long size); + @LogMessage(level = Logger.Level.WARN) + @Message(id = 16, value = "Security problem while creating session: {0}", format = Message.Format.MESSAGE_FORMAT) + void securityProblemWhileCreatingSession(String message); + @LogMessage(level = Logger.Level.ERROR) @Message(id = 224000, value = "Failure in initialisation", format = Message.Format.MESSAGE_FORMAT) http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f1d67df5/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/CertificateLoginModule.java -- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/CertificateLoginModule.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/CertificateLoginModule.java index 9c10058..0625ba5 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/CertificateLoginModule.java +++
[1/2] activemq-artemis git commit: This closes #950
Repository: activemq-artemis Updated Branches: refs/heads/master 2eb51985b -> ced0e9c86 This closes #950 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ced0e9c8 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ced0e9c8 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ced0e9c8 Branch: refs/heads/master Commit: ced0e9c8616a024cedbd7669dce6abce3e21457f Parents: 2eb5198 f1d67df Author: Clebert SuconicAuthored: Mon Jan 9 12:17:48 2017 -0500 Committer: Clebert Suconic Committed: Mon Jan 9 12:17:48 2017 -0500 -- .../protocol/core/impl/ActiveMQPacketHandler.java | 4 .../artemis/core/server/ActiveMQServerLogger.java | 4 .../security/jaas/CertificateLoginModule.java | 2 +- .../spi/core/security/jaas/LDAPLoginModule.java | 1 - .../core/security/jaas/PropertiesLoginModule.java | 18 +++--- 5 files changed, 16 insertions(+), 13 deletions(-) --
[1/2] activemq-artemis git commit: This closes #952
Repository: activemq-artemis Updated Branches: refs/heads/master ef4efe7d3 -> 2eb51985b This closes #952 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2eb51985 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2eb51985 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2eb51985 Branch: refs/heads/master Commit: 2eb51985bc4ca203455ebf1160e21df83568fb8f Parents: ef4efe7 63cf4d5 Author: Justin BertramAuthored: Mon Jan 9 09:50:36 2017 -0600 Committer: Justin Bertram Committed: Mon Jan 9 09:50:36 2017 -0600 -- .../artemis/tools/migrate/config/Main.java | 37 ++-- 1 file changed, 18 insertions(+), 19 deletions(-) --
[2/2] activemq-artemis git commit: ARTEMIS-912 Fix file configuration migration tool
ARTEMIS-912 Fix file configuration migration tool Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/63cf4d5a Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/63cf4d5a Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/63cf4d5a Branch: refs/heads/master Commit: 63cf4d5a601e7e44c22144cdeb98a4357f1bcf16 Parents: ef4efe7 Author: Martyn TaylorAuthored: Mon Jan 9 14:48:28 2017 + Committer: Justin Bertram Committed: Mon Jan 9 09:50:36 2017 -0600 -- .../artemis/tools/migrate/config/Main.java | 37 ++-- 1 file changed, 18 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/63cf4d5a/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/Main.java -- diff --git a/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/Main.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/Main.java index 754dc15..692ab9e 100644 --- a/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/Main.java +++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/Main.java @@ -29,7 +29,7 @@ public class Main { File input = new File(args[0]); if (input.isDirectory()) { System.out.println("Scanning directory: " + input.getAbsolutePath()); -recursiveTransform(input); +scanAndTransform(input); } else { if (args.length != 2) { System.err.println("Invalid args"); @@ -37,6 +37,7 @@ public class Main { } else { try { XMLConfigurationMigration migration = new XMLConfigurationMigration(input, new File(args[1])); + migration.transform(); } catch (Exception e) { // Unable to process file, move on. } @@ -51,30 +52,28 @@ public class Main { } } - public static void scanAndTransform(File pFile) throws Exception { + public static void scanAndTransform(File f) throws Exception { try { - for (File f : pFile.listFiles()) { -if (f.isDirectory()) { - scanAndTransform(f); -} else { - try { - if (f.getName().endsWith("xml")) { - File file = new File(f.getAbsolutePath() + ".new"); - XMLConfigurationMigration migration = new XMLConfigurationMigration(f, file); - if (migration.transform()) { -File r = new File(f.getAbsolutePath()); -f.renameTo(new File(f.getAbsolutePath() + ".bk")); -file.renameTo(r); -System.out.println(f + " converted, old file renamed as " + f.getAbsolutePath() + ".bk"); - } + if (f.isDirectory()) { +recursiveTransform(f); + } else { +try { + if (f.getName().endsWith("xml")) { + File file = new File(f.getAbsolutePath() + ".new"); + XMLConfigurationMigration migration = new XMLConfigurationMigration(f, file); + if (migration.transform()) { + File r = new File(f.getAbsolutePath()); + f.renameTo(new File(f.getAbsolutePath() + ".bk")); + file.renameTo(r); + System.out.println(f + " converted, old file renamed as " + f.getAbsolutePath() + ".bk"); } - } catch (Exception e) { - //Unable to process file, continue } +} catch (Exception e) { + //Unable to process file, continue } } } catch (NullPointerException e) { - System.out.println(pFile.getAbsoluteFile()); + System.out.println(f.getAbsoluteFile()); } }
[1/3] activemq-artemis git commit: couple of small changes to JMX mbeans - no jira
Repository: activemq-artemis Updated Branches: refs/heads/master 79647167f -> ef4efe7d3 couple of small changes to JMX mbeans - no jira Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6af85a2c Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6af85a2c Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6af85a2c Branch: refs/heads/master Commit: 6af85a2cc456feb4abe39d3b02a2345770738426 Parents: 83e83e7 Author: Andy TaylorAuthored: Mon Jan 9 13:32:01 2017 + Committer: Andy Taylor Committed: Mon Jan 9 13:40:14 2017 + -- .../artemis/api/core/management/AddressControl.java | 6 ++ .../artemis/api/core/management/QueueControl.java | 4 ++-- .../core/management/impl/AddressControlImpl.java| 16 .../core/management/impl/QueueControlImpl.java | 6 +++--- 4 files changed, 27 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6af85a2c/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java -- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java index c48ef88..92b0082 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java @@ -39,6 +39,12 @@ public interface AddressControl { @Attribute(desc = "Get the delivery modes enabled on this address") Set getDeliveryModes(); + /* + * Whether multicast routing is enabled for this address + * */ + @Attribute(desc = "Get the delivery modes enabled on this address as JSON") + String getDeliveryModesAsJSON() throws Exception; + /** * Returns the roles (name and permissions) associated with this address. */ http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6af85a2c/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java -- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java index dbd3ea5..25c154f 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java @@ -357,7 +357,7 @@ public interface QueueControl { */ @Operation(desc = "Sends a TextMessage to a password-protected destination.", impact = MBeanOperationInfo.ACTION) String sendMessage(@Parameter(name = "headers", desc = "The headers to add to the message") Map headers, - @Parameter(name = "headers", desc = "A type for the message") final int type, + @Parameter(name = "type", desc = "A type for the message") final int type, @Parameter(name = "body", desc = "The body (byte[]) of the message encoded as a string using Base64") String body, @Parameter(name = "durable", desc = "Whether the message is durable") boolean durable, @Parameter(name = "user", desc = "The user to authenticate with") String user, @@ -448,7 +448,7 @@ public interface QueueControl { * Resets the MessagesAdded property */ @Operation(desc = "Browse Messages", impact = MBeanOperationInfo.ACTION) - CompositeData[] browse(String filter) throws Exception; + CompositeData[] browse(@Parameter(name = "filter", desc = "A message filter (can be empty)") String filter) throws Exception; /** * Resets the MessagesAdded property http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6af85a2c/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java -- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java index 06c21a1..4547f9e 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java +++
[2/3] activemq-artemis git commit: ARTEMIS-911 - increase ack variable on individualAcknowledge
ARTEMIS-911 - increase ack variable on individualAcknowledge https://issues.apache.org/jira/browse/ARTEMIS-911 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/83e83e7d Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/83e83e7d Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/83e83e7d Branch: refs/heads/master Commit: 83e83e7d87555edc40fc2f5198fa6ec26efe9a91 Parents: 7964716 Author: Andy TaylorAuthored: Mon Jan 9 13:31:19 2017 + Committer: Andy Taylor Committed: Mon Jan 9 13:40:14 2017 + -- .../activemq/artemis/core/server/impl/ServerConsumerImpl.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/83e83e7d/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java -- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java index 3e5b20a..bcc6df1 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java @@ -868,6 +868,8 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener { ref.acknowledge(tx); + acks++; + if (startedTransaction) { tx.commit(); }
[3/3] activemq-artemis git commit: This closes #951
This closes #951 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ef4efe7d Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ef4efe7d Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ef4efe7d Branch: refs/heads/master Commit: ef4efe7d3f50862ff8e070f878320c83a116574e Parents: 7964716 6af85a2 Author: Martyn TaylorAuthored: Mon Jan 9 14:53:58 2017 + Committer: Martyn Taylor Committed: Mon Jan 9 14:53:58 2017 + -- .../artemis/api/core/management/AddressControl.java | 6 ++ .../artemis/api/core/management/QueueControl.java | 4 ++-- .../core/management/impl/AddressControlImpl.java| 16 .../core/management/impl/QueueControlImpl.java | 6 +++--- .../core/server/impl/ServerConsumerImpl.java| 2 ++ 5 files changed, 29 insertions(+), 5 deletions(-) --