(activemq-artemis) branch main updated: NO-JIRA fix flow-control doc formatting
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new c378ef9da7 NO-JIRA fix flow-control doc formatting c378ef9da7 is described below commit c378ef9da7740540001d78e3bc355ba8f0f66dd8 Author: Justin Bertram AuthorDate: Wed Jun 5 10:18:36 2024 -0500 NO-JIRA fix flow-control doc formatting --- docs/user-manual/flow-control.adoc | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/user-manual/flow-control.adoc b/docs/user-manual/flow-control.adoc index 2021d1ce06..2bc36d7334 100644 --- a/docs/user-manual/flow-control.adoc +++ b/docs/user-manual/flow-control.adoc @@ -10,7 +10,7 @@ This controls the flow of data between the server and the client as the client c For performance reasons clients normally buffer messages before delivering to the consumer via the `receive()` method or asynchronously via a message listener. If the consumer cannot process messages as fast as they are being delivered and stored in the internal buffer, then you could end up with a situation where messages would keep building up possibly causing out of memory on the client if they cannot be processed in time. -== Window-Based Flow Control +=== Window-Based Flow Control By default, Apache ActiveMQ Artemis consumers buffer messages from the server in a client side buffer before the client consumes them. This improves performance: otherwise every time the client consumes a message, Apache ActiveMQ Artemis would have to go the server to request the next message. @@ -32,7 +32,7 @@ The value can be: Setting the consumer window size can considerably improve performance depending on the messaging use case. As an example, let's consider the two extremes: -=== Fast consumers + Fast consumers Fast consumers can process messages as fast as they consume them (or even faster) @@ -41,7 +41,7 @@ This will allow _unbounded_ message buffering on the client side. Use this setting with caution: it can overflow the client memory if the consumer is not able to process messages as fast as it receives them. -=== Slow consumers + Slow consumers Slow consumers takes significant time to process each message and it is desirable to prevent buffering messages on the client side so that they can be delivered to another consumer instead. @@ -62,7 +62,7 @@ In that case, setting the value of `consumerWindowSize` to optimize performance Please see xref:examples.adoc#examples[the examples chapter] for an example which shows how to configure ActiveMQ Artemis to prevent consumer buffering when dealing with slow consumers. -== Rate limited flow control +=== Rate limited flow control It is also possible to control the _rate_ at which a consumer can consume messages. This is a form of throttling and can be used to make sure that a consumer never consumes messages at a rate faster than the rate specified. - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-4306 fix tests
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 4cd4ecb198 ARTEMIS-4306 fix tests
4cd4ecb198 is described below
commit 4cd4ecb198f328be1cd7932294b6d52d23e371b9
Author: Justin Bertram
AuthorDate: Tue May 28 21:17:33 2024 -0500
ARTEMIS-4306 fix tests
---
.../tests/integration/management/ActiveMQServerControlTest.java | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
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 190bab2440..0bd0327363 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
@@ -139,6 +139,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
+import static org.junit.Assume.assumeFalse;
+
@RunWith(Parameterized.class)
public class ActiveMQServerControlTest extends ManagementTestBase {
@@ -321,6 +323,9 @@ public class ActiveMQServerControlTest extends
ManagementTestBase {
@Test
public void testAuthCounts() throws Exception {
+ // don't test this with management messages as it completely throws off
the auth counts
+ assumeFalse(usingCore());
+
ActiveMQServerControl serverControl = createManagementControl();
Assert.assertEquals(0, serverControl.getAuthenticationSuccessCount());
@@ -1138,7 +1143,7 @@ public class ActiveMQServerControlTest extends
ManagementTestBase {
String addressMatch = "test.#";
String exactAddress = "test.whatever";
- assertEquals(1, serverControl.getRoles(addressMatch).length);
+ assertEquals(2, serverControl.getRoles(addressMatch).length);
serverControl.addSecuritySettings(addressMatch, "foo", "foo, bar", null,
"bar", "foo, bar", "", "", "bar", "foo", "foo", "", "");
// Restart the server. Those settings should be persisted
@@ -1218,7 +1223,7 @@ public class ActiveMQServerControlTest extends
ManagementTestBase {
assertFalse((boolean)barRole[10]);
serverControl.removeSecuritySettings(addressMatch);
- assertEquals(1, serverControl.getRoles(exactAddress).length);
+ assertEquals(2, serverControl.getRoles(exactAddress).length);
}
@Test
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-4783 touch up federation docs
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new b61776e744 ARTEMIS-4783 touch up federation docs new 7d6ab48763 This closes #4938 b61776e744 is described below commit b61776e744c5c05467b166aa97a5ab43ab4f1306 Author: Michal T AuthorDate: Thu May 16 12:27:41 2024 +0200 ARTEMIS-4783 touch up federation docs --- docs/user-manual/amqp-broker-connections.adoc | 187 +++--- docs/user-manual/federation-address.adoc | 150 +++-- docs/user-manual/federation-queue.adoc| 94 ++--- docs/user-manual/federation.adoc | 50 --- 4 files changed, 266 insertions(+), 215 deletions(-) diff --git a/docs/user-manual/amqp-broker-connections.adoc b/docs/user-manual/amqp-broker-connections.adoc index b74051e35e..af627b6239 100644 --- a/docs/user-manual/amqp-broker-connections.adoc +++ b/docs/user-manual/amqp-broker-connections.adoc @@ -21,7 +21,7 @@ Broker connections are configured by the `` XML element in t An ActiveMQ Artemis broker can initiate connections using the AMQP protocol. This means that the broker can connect to another AMQP server (not necessarily ActiveMQ Artemis) and create elements on that connection. -To define an AMQP broker connection, add an `` element within the `` element within the `` element in the `broker.xml` configuration file. For example: [,xml] @@ -34,44 +34,43 @@ For example: uri:: -: tcp://host:myport[?options] (this is a required argument) +tcp://host:myport[?options] (this is a required argument) name:: -: Name of the connection used for management purposes +Name of the connection used for management purposes user:: -: User name with which to connect to the endpoint (this is an optional argument) +Username with which to connect to the endpoint (this is an optional argument) password:: -: Password with which to connect to the endpoint (this is an optional argument) +Password with which to connect to the endpoint (this is an optional argument) retry-interval:: -: Time, in milliseconds to wait before retrying a connection after an error. +Time, in milliseconds to wait before retrying a connection after an error. The default value is `5000`. reconnect-attempts:: -: default is -1 meaning infinite +default is -1 meaning infinite auto-start:: - : Should the broker connection start automatically with the broker. -Default is `true`. -If false it is necessary to call a management operation to start it. +Should the broker connection start automatically with the broker. Default is `true`. +If `false` it is necessary to call a management operation to start it. NOTE: The connection URI options for transport settings, such as enabling and configuring TLS, are common with other Artemis connector URIs. See xref:configuring-transports.adoc#configuring-netty-ssl[the transport doc] for more. -An example configuration for a TLS AMQP broker-connection can be found in the broker xref:examples.adoc[examples] at ./examples/features/broker-connection/amqp-sending-overssl. +An example configuration for a TLS AMQP broker-connection can be found in the broker xref:examples.adoc[examples] at _./examples/features/broker-connection/amqp-sending-overssl_. NOTE: If auto-start is disabled on the broker connection, the start of the broker connection will only happen after the management method `startBrokerConnection(connectionName)` is called on the ServerController. IMPORTANT: The target endpoint needs permission for all operations that are configured. -Therefore, If a security manager is being used, ensure that you perform the configured operations with a user with sufficient permissions. +Therefore, if a security manager is being used, ensure that you perform the configured operations with a user with sufficient permissions. == AMQP Server Connection Operations The following types of operations are supported on an AMQP server connection: * Mirrors - ** The broker uses an AMQP connection to another broker and duplicates messages and sends acknowledgements over the wire. +** The broker uses an AMQP connection to another broker and duplicates messages and sends acknowledgements over the wire. * Senders - ** Messages received on specific queues are transferred to another endpoint. +** Messages received on specific queues are transferred to another endpoint. * Receivers - ** The broker pulls messages from another endpoint. +** The broker pulls messages from another endpoint. * Peers - ** The broker creates both senders and receivers on another endpoint that knows how to handle them. +** The broker creates both senders and receivers on another endpoint that knows how to handle them. This is currently implemented by Apache Qpid Dispatch. == Reconnecting and Failover
(activemq-artemis) branch main updated: ARTEMIS-4726 fix original commit
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new c47713454c ARTEMIS-4726 fix original commit
c47713454c is described below
commit c47713454caeece82df29a0a7fd4a2a39000576b
Author: Justin Bertram
AuthorDate: Wed May 22 23:19:33 2024 -0500
ARTEMIS-4726 fix original commit
The original commit (1ee3e884b707a659d924188048c2960a3b22df35) for this
issue wasn't completely correct. This commit fixes those issues so that
both the messageCount and scheduledMessageCount are accurate now when
a scheduled message is removed by its ID.
---
.../activemq/artemis/core/paging/cursor/PagedReferenceImpl.java| 5 +
.../org/apache/activemq/artemis/core/server/MessageReference.java | 2 ++
.../artemis/core/server/impl/GroupFirstMessageReference.java | 5 +
.../activemq/artemis/core/server/impl/MessageReferenceImpl.java| 7 ++-
.../artemis/core/server/impl/ScheduledDeliveryHandlerImpl.java | 3 ++-
.../artemis/tests/integration/scheduling/ScheduledMessageTest.java | 2 ++
6 files changed, 22 insertions(+), 2 deletions(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java
index 0abc464360..873485b961 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java
@@ -275,6 +275,11 @@ public class PagedReferenceImpl extends
AbstractProtocolReference implements Pag
getQueue().acknowledge(tx, this, reason, consumer, true);
}
+ @Override
+ public void acknowledge(Transaction tx, AckReason reason, ServerConsumer
consumer, boolean delivering) throws Exception {
+ getQueue().acknowledge(tx, this, reason, consumer, delivering);
+ }
+
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/MessageReference.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/MessageReference.java
index 6c290610d4..a803d88d9e 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/MessageReference.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/MessageReference.java
@@ -114,6 +114,8 @@ public interface MessageReference {
void acknowledge(Transaction tx, AckReason reason, ServerConsumer consumer)
throws Exception;
+ void acknowledge(Transaction tx, AckReason reason, ServerConsumer consumer,
boolean delivering) throws Exception;
+
void emptyConsumerID();
void setConsumerId(long consumerID);
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/GroupFirstMessageReference.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/GroupFirstMessageReference.java
index 146bacf639..2f2dec6357 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/GroupFirstMessageReference.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/GroupFirstMessageReference.java
@@ -168,6 +168,11 @@ public class GroupFirstMessageReference implements
MessageReference {
messageReference.acknowledge(tx, reason, consumer);
}
+ @Override
+ public void acknowledge(Transaction tx, AckReason reason, ServerConsumer
consumer, boolean delivering) throws Exception {
+ messageReference.acknowledge(tx, reason, consumer, delivering);
+ }
+
@Override
public void emptyConsumerID() {
messageReference.emptyConsumerID();
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
index 5371b78947..313a23f6d2 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
@@ -266,10 +266,15 @@ public class MessageReferenceImpl extends
AbstractProtocolReference implements M
@Override
public void acknowledge(Transaction tx, AckReason reason, ServerConsumer
consumer) throws Exception {
+ acknowledge(tx, reason, consumer, true);
+ }
+
+ @Override
+ public void acknowledge(Transaction tx, AckReason reason, ServerConsumer
consumer, boolean delivering) throws Exception {
if (tx == null) {
getQueue().acknowledge(this, reason, consumer);
} else {
- getQueue().acknowledge(tx
(activemq-website) branch main updated (0ade36afa -> 0ae6e5009)
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git from 0ade36afa NO-JIRA clarify Artemis docs around queue auto-creation add 754b36c08 Documentation wording fix new 0ae6e5009 Merge pull request #128 from kenliao94/encrypted_password_doc_change The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/components/classic/documentation/encrypted-passwords.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(activemq-website) 01/01: Merge pull request #128 from kenliao94/encrypted_password_doc_change
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git commit 0ae6e5009f6aa671f2a4ae9a1902c121eff4656c Merge: 0ade36afa 754b36c08 Author: Justin Bertram AuthorDate: Wed May 22 14:59:53 2024 -0500 Merge pull request #128 from kenliao94/encrypted_password_doc_change Documentation wording fix src/components/classic/documentation/encrypted-passwords.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(activemq-artemis) branch main updated: ARTEMIS-4768 _AMQ_SCHED_DELIVERY msg prop lost after broker restart
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 7e151ee1ce ARTEMIS-4768 _AMQ_SCHED_DELIVERY msg prop lost after broker
restart
7e151ee1ce is described below
commit 7e151ee1cee02496e0552d3be8da034ded4aa08f
Author: Justin Bertram
AuthorDate: Wed May 8 17:18:21 2024 -0500
ARTEMIS-4768 _AMQ_SCHED_DELIVERY msg prop lost after broker restart
---
.../core/server/impl/PostOfficeJournalLoader.java | 16 ++---
.../client/ScheduledMessageRestartTest.java| 68 ++
2 files changed, 74 insertions(+), 10 deletions(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
index e6c6f706cd..6cb0e249e8 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
@@ -231,22 +231,18 @@ public class PostOfficeJournalLoader implements
JournalLoader {
try {
long scheduledDeliveryTime = record.getScheduledDeliveryTime();
- if (scheduledDeliveryTime != 0 && scheduledDeliveryTime <=
currentTime) {
- scheduledDeliveryTime = 0;
- record.getMessage().setScheduledDeliveryTime(0L);
- }
-
if (scheduledDeliveryTime != 0) {
-
record.getMessage().setScheduledDeliveryTime(scheduledDeliveryTime);
+ if (scheduledDeliveryTime <= currentTime) {
+ // scheduled delivery time already passed while the
broker wasn't running
+ record.getMessage().setScheduledDeliveryTime(0L);
+ } else {
+
record.getMessage().setScheduledDeliveryTime(scheduledDeliveryTime);
+ }
}
MessageReference ref = postOffice.reload(record.getMessage(),
queue, null);
ref.setDeliveryCount(record.getDeliveryCount());
-
- if (scheduledDeliveryTime != 0) {
- record.getMessage().setScheduledDeliveryTime(0L);
- }
} catch (Throwable t) {
ActiveMQServerLogger.LOGGER.unableToLoadMessageFromJournal(t);
continue;
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ScheduledMessageRestartTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ScheduledMessageRestartTest.java
new file mode 100644
index 00..76dee79771
--- /dev/null
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ScheduledMessageRestartTest.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tests.integration.client;
+
+import java.util.List;
+
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.QueueConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.MessageReference;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ScheduledMessageRestartTest extends ActiveMQTestBase {
+
+ private ActiveMQServer server;
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+
(activemq-artemis) branch main updated: ARTEMIS-4420 user auth leaks into non-Artemis servlets
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new e13d65b16d ARTEMIS-4420 user auth leaks into non-Artemis servlets
e13d65b16d is described below
commit e13d65b16d4ac1c5edccc51f99cc7c33994f07f1
Author: Justin Bertram
AuthorDate: Wed May 22 09:08:45 2024 -0500
ARTEMIS-4420 user auth leaks into non-Artemis servlets
---
.../activemq/artemis/component/WebServerComponent.java | 18 ++
1 file changed, 18 insertions(+)
diff --git
a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
index 88c828e36f..4b77d51641 100644
---
a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
+++
b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
@@ -17,6 +17,10 @@
package org.apache.activemq.artemis.component;
import javax.servlet.DispatcherType;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletRequestEvent;
+import javax.servlet.ServletRequestListener;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -40,6 +44,7 @@ import org.apache.activemq.artemis.dto.AppDTO;
import org.apache.activemq.artemis.dto.BindingDTO;
import org.apache.activemq.artemis.dto.ComponentDTO;
import org.apache.activemq.artemis.dto.WebServerDTO;
+import org.apache.activemq.artemis.logs.AuditLogger;
import org.apache.activemq.artemis.marker.WebServerComponentMarker;
import org.apache.activemq.artemis.utils.ClassloadingUtil;
import org.apache.activemq.artemis.utils.PemConfigUtil;
@@ -166,6 +171,19 @@ public class WebServerComponent implements
ExternalComponent, WebServerComponent
handlers.addHandler(webContext);
webContext.setInitParameter(DIR_ALLOWED, "false");
webContext.getSessionHandler().getSessionCookieConfig().setComment("__SAME_SITE_STRICT__");
+ webContext.addEventListener(new ServletContextListener() {
+ @Override
+ public void contextInitialized(ServletContextEvent sce) {
+ sce.getServletContext().addListener(new
ServletRequestListener() {
+@Override
+public void requestDestroyed(ServletRequestEvent sre) {
+ ServletRequestListener.super.requestDestroyed(sre);
+ AuditLogger.currentCaller.remove();
+ AuditLogger.remoteAddress.remove();
+}
+ });
+ }
+ });
webContextData.add(new Pair(webContext, binding.uri));
}
}
(activemq-artemis) branch main updated: ARTEMIS-4726 removing scheduled msg from q via mngmnt can cause negative msg count
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 1ee3e884b7 ARTEMIS-4726 removing scheduled msg from q via mngmnt can
cause negative msg count
1ee3e884b7 is described below
commit 1ee3e884b707a659d924188048c2960a3b22df35
Author: Justin Bertram
AuthorDate: Wed Apr 17 17:01:25 2024 -0500
ARTEMIS-4726 removing scheduled msg from q via mngmnt can cause negative
msg count
---
.../core/server/impl/ScheduledDeliveryHandlerImpl.java | 1 -
.../integration/scheduling/ScheduledMessageTest.java | 18 ++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerImpl.java
index 1e848bc793..1bc9d24b66 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerImpl.java
@@ -178,7 +178,6 @@ public class ScheduledDeliveryHandlerImpl implements
ScheduledDeliveryHandler {
ref.acknowledge(tx);
iter.remove();
notifyScheduledReferencesUpdated();
- metrics.decrementMetrics(ref);
return ref;
}
}
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java
index 956df30e93..6ae52b8245 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java
@@ -543,6 +543,24 @@ public class ScheduledMessageTest extends ActiveMQTestBase
{
session.close();
}
+ @Test
+ public void testManagementDeleteById() throws Exception {
+ try (ClientSessionFactory sessionFactory =
createSessionFactory(locator)) {
+ ClientSession session = sessionFactory.createSession(false, false,
false);
+ session.createQueue(new QueueConfiguration(atestq));
+ ClientProducer producer = session.createProducer(atestq);
+ ClientMessage messageToSend = session.createMessage(true);
+ messageToSend.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME,
System.currentTimeMillis() + 999_999_999);
+ producer.send(messageToSend);
+ session.commit();
+ }
+
+ QueueControl queueControl = (QueueControl)
server.getManagementService().getResource(ResourceNames.QUEUE + atestq);
+ assertEquals(1, queueControl.getMessageCount());
+ assertTrue(queueControl.removeMessage((long)
queueControl.listScheduledMessages()[0].get("messageID")));
+ assertEquals(0, queueControl.getMessageCount());
+ }
+
@Test
public void testManagementDeliveryByFilter() throws Exception {
final String propertyValue = RandomUtil.randomString();
(activemq-artemis) branch main updated: NO-JIRA clarify expiry config doc
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 7067b75670 NO-JIRA clarify expiry config doc 7067b75670 is described below commit 7067b75670ca34bcfdc1fad39c2d1919b23c8b46 Author: Justin Bertram AuthorDate: Mon May 20 15:08:53 2024 -0500 NO-JIRA clarify expiry config doc --- docs/user-manual/message-expiry.adoc | 12 1 file changed, 12 insertions(+) diff --git a/docs/user-manual/message-expiry.adoc b/docs/user-manual/message-expiry.adoc index 2855e26120..2805b7dc53 100644 --- a/docs/user-manual/message-expiry.adoc +++ b/docs/user-manual/message-expiry.adoc @@ -91,6 +91,18 @@ Expiry address are defined in the address-setting configuration: If messages are expired and no expiry address is specified, messages are simply removed from the queue and dropped. Address xref:wildcard-syntax.adoc#wildcard-syntax[wildcards] can be used to configure expiry address for a set of addresses. +If a wildcard is used to configure the expiry address for a set of addresses and you want to _unset_ the expiry address for a particular addess (or set of addresses) then you can do so, e.g.: + +[,xml] + + + expiryQueue + + + + + + == Configuring Automatic Creation of Expiry Resources It's common to segregate expired messages by their original address.
(activemq-artemis) branch main updated: ARTEMIS-4772 expose broker plugin classes via management
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new f7b15e351e ARTEMIS-4772 expose broker plugin classes via management
new a88eba2bdb This closes #4935
f7b15e351e is described below
commit f7b15e351ef712213e0db1d072a2f0ce84f7bb8e
Author: m.napieraj
AuthorDate: Wed May 15 16:37:09 2024 +0200
ARTEMIS-4772 expose broker plugin classes via management
---
.../apache/activemq/artemis/logs/AuditLogger.java | 6 +
.../api/core/management/ActiveMQServerControl.java | 4 +++
.../management/impl/ActiveMQServerControlImpl.java | 19 ++
.../management/ActiveMQServerControlTest.java | 29 ++
.../ActiveMQServerControlUsingCoreTest.java| 5
5 files changed, 63 insertions(+)
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
index 004a9a38c6..215c676bb2 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
@@ -2710,4 +2710,10 @@ public interface AuditLogger {
@LogMessage(id = 601776, value = "User {} is getting first message as json
on target resource: {}", level = LogMessage.Level.INFO)
void peekFirstMessageAsJSON(String user, Object source);
+ static void getBrokerPluginClassNames(Object source) {
+ BASE_LOGGER.getBrokerPluginClassNames(getCaller(), source);
+ }
+
+ @LogMessage(id = 601777, value = "User {} is getting broker plugin class
names on target resource: {}", level = LogMessage.Level.INFO)
+ void getBrokerPluginClassNames(String user, Object source);
}
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
index b8633e8c79..e671a2d2d9 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
@@ -111,6 +111,10 @@ public interface ActiveMQServerControl {
@Attribute(desc = "List of interceptors used by this server for outgoing
messages")
String[] getOutgoingInterceptorClassNames();
+
+ @Attribute(desc = "List of broker plugin class names used by this server")
+ String[] getBrokerPluginClassNames();
+
/**
* Returns whether this server is clustered.
*/
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index b50489994c..ee31b5186f 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -49,6 +49,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
import java.util.stream.Collectors;
import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
@@ -125,6 +126,7 @@ import
org.apache.activemq.artemis.core.server.group.GroupingHandler;
import org.apache.activemq.artemis.core.server.impl.Activation;
import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import
org.apache.activemq.artemis.core.server.impl.SharedNothingPrimaryActivation;
+import org.apache.activemq.artemis.core.server.plugin.ActiveMQServerBasePlugin;
import org.apache.activemq.artemis.core.server.replay.ReplayManager;
import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
@@ -351,6 +353,23 @@ public class ActiveMQServerControlImpl extends
AbstractControl implements Active
}
}
+ @Override
+ public String[] getBrokerPluginClassNames() {
+ if (AuditLogger.isBaseLoggingEnabled()) {
+ AuditLogger.getBrokerPluginClassNames(this.server);
+ }
+ checkStarted();
+
+ clearIO();
+ try {
+ return configuration.getBrokerPlugins().stream()
+.map(brokerPlugin -> brokerPlugin.getClass().getCanonicalName() !=
null ? brokerPlugin.getClass().getCanonicalName() :
brokerPlugin.getClass().getName())
+.toArray(String[]::new);
+ } finally {
+ blockOnIO()
(activemq-artemis) branch main updated: ARTEMIS-4751 upgrade to Apache parent 32
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new eac816f6bd ARTEMIS-4751 upgrade to Apache parent 32
eac816f6bd is described below
commit eac816f6bd592ea0f06cbf08b410362ff4e48e3e
Author: Justin Bertram
AuthorDate: Wed May 1 13:33:05 2024 -0500
ARTEMIS-4751 upgrade to Apache parent 32
Due to https://github.com/apache/maven-apache-parent/pull/188 the
property `maven.compiler.release` is now being set which precludes
exporting and using any internal Java classes. Therefore this commit
removed references to `--add-exports` from the build, switches to
reflection, and adds `--add-opens` to the runtime JVM parameters.
---
.../cli/commands/messages/perf/MicrosClock.java| 43 ++
.../artemis/cli/commands/etc/artemis.profile | 2 +-
.../artemis/cli/commands/etc/artemis.profile.cmd | 2 +-
pom.xml| 19 +-
tests/smoke-tests/pom.xml | 10 -
.../artemis/tests/smoke/jmx/JmxConnectionTest.java | 10 ++---
6 files changed, 36 insertions(+), 50 deletions(-)
diff --git
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/perf/MicrosClock.java
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/perf/MicrosClock.java
index 29875b6e40..7d3d14e7a7 100644
---
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/perf/MicrosClock.java
+++
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/perf/MicrosClock.java
@@ -16,6 +16,8 @@
*/
package org.apache.activemq.artemis.cli.commands.messages.perf;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.concurrent.TimeUnit;
public class MicrosClock {
@@ -23,6 +25,8 @@ public class MicrosClock {
// no need for volatile here
private static long offset = -1;
private static long NANOS_PER_SECOND = TimeUnit.SECONDS.toNanos(1);
+ private static Class vm;
+ private static Method getNanoTimeAdjustment;
private static final boolean AVAILABLE = checkAvailable();
@@ -43,23 +47,32 @@ public class MicrosClock {
}
public static long now() {
- long epochSecond = offset;
- long nanoAdjustment =
jdk.internal.misc.VM.getNanoTimeAdjustment(epochSecond);
+ try {
+ long epochSecond = offset;
+ if (vm == null) {
+vm = Class.forName("jdk.internal.misc.VM");
+ }
+ if (getNanoTimeAdjustment == null) {
+getNanoTimeAdjustment = vm.getMethod("getNanoTimeAdjustment",
long.class);
+ }
+ long nanoAdjustment = (long)
getNanoTimeAdjustment.invoke(getNanoTimeAdjustment, epochSecond);
- if (nanoAdjustment == -1) {
- epochSecond = System.currentTimeMillis() / 1000 - 1024;
- nanoAdjustment =
jdk.internal.misc.VM.getNanoTimeAdjustment(epochSecond);
if (nanoAdjustment == -1) {
-throw new InternalError("Offset " + epochSecond + " is not in
range");
- } else {
-offset = epochSecond;
+epochSecond = System.currentTimeMillis() / 1000 - 1024;
+nanoAdjustment = (long)
getNanoTimeAdjustment.invoke(getNanoTimeAdjustment, epochSecond);
+if (nanoAdjustment == -1) {
+ throw new InternalError("Offset " + epochSecond + " is not in
range");
+} else {
+ offset = epochSecond;
+}
}
+ final long secs = Math.addExact(epochSecond,
Math.floorDiv(nanoAdjustment, NANOS_PER_SECOND));
+ final long secsInUs = TimeUnit.SECONDS.toMicros(secs);
+ final long nsOffset = (int) Math.floorMod(nanoAdjustment,
NANOS_PER_SECOND);
+ final long usOffset = TimeUnit.NANOSECONDS.toMicros(nsOffset);
+ return secsInUs + usOffset;
+ } catch (ClassNotFoundException | NoSuchMethodException |
InvocationTargetException | IllegalAccessException e) {
+ throw new IllegalStateException(e);
}
- final long secs = Math.addExact(epochSecond,
Math.floorDiv(nanoAdjustment, NANOS_PER_SECOND));
- final long secsInUs = TimeUnit.SECONDS.toMicros(secs);
- final long nsOffset = (int) Math.floorMod(nanoAdjustment,
NANOS_PER_SECOND);
- final long usOffset = TimeUnit.NANOSECONDS.toMicros(nsOffset);
- return secsInUs + usOffset;
}
-
-}
+}
\ No newline at end of file
diff --git
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
index ec3532663e..4e1c28dc37 100644
---
a/artemis-cli/src/main/resources/
(activemq-artemis) branch main updated: ARTEMIS-4755 upgrade Jackson to 2.17.0
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new e8f449973a ARTEMIS-4755 upgrade Jackson to 2.17.0
e8f449973a is described below
commit e8f449973ae8ce7225e439e57a44722d146e4bc1
Author: Justin Bertram
AuthorDate: Wed May 1 15:25:48 2024 -0500
ARTEMIS-4755 upgrade Jackson to 2.17.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8589e8301c..39735d120c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,7 +191,7 @@
9.0.9
5.3.33
- 2.16.1
+ 2.17.0
${jackson.version}
${project.version}
(activemq-artemis) branch main updated: ARTEMIS-4757 upgrade Netty to 4.1.109.Final
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 732b6dbcda ARTEMIS-4757 upgrade Netty to 4.1.109.Final 732b6dbcda is described below commit 732b6dbcdac774fed0049b5daf7366a967bcfa78 Author: Justin Bertram AuthorDate: Wed May 1 19:07:44 2024 -0500 ARTEMIS-4757 upgrade Netty to 4.1.109.Final --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9b530dfef1..1929b37105 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 10.15.0 5.10.0 4.0.2 - 4.1.108.Final + 4.1.109.Final 2.1.12 5.6.0 3.9.1
(activemq-artemis) branch main updated: ARTEMIS-4753 upgrade Checkstyle to 10.16.0
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new d568f0dd85 ARTEMIS-4753 upgrade Checkstyle to 10.16.0 d568f0dd85 is described below commit d568f0dd85ba1eb031817e2e9e76ff1021c84980 Author: Justin Bertram AuthorDate: Wed May 1 15:11:45 2024 -0500 ARTEMIS-4753 upgrade Checkstyle to 10.16.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 20398e17b4..8589e8301c 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 3.3.2 2.16.1 1.44.1 - 10.15.0 + 10.16.0 5.10.0 4.0.2 4.1.109.Final
(activemq-artemis) branch main updated: ARTEMIS-4756 upgrade Commons IO to 2.16.1
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new cb69d2b2f9 ARTEMIS-4756 upgrade Commons IO to 2.16.1 cb69d2b2f9 is described below commit cb69d2b2f96489f503c8a603ebd2fd5c8a04a59e Author: Justin Bertram AuthorDate: Wed May 1 15:29:19 2024 -0500 ARTEMIS-4756 upgrade Commons IO to 2.16.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1929b37105..20398e17b4 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ 2.12.0 3.2.2 1.10.0 - 2.15.1 + 2.16.1 1.16.0 1.16 3.1.8
(activemq-website) branch main updated: NO-JIRA clarify Artemis docs around queue auto-creation
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new 0ade36afa NO-JIRA clarify Artemis docs around queue auto-creation 0ade36afa is described below commit 0ade36afad180e983ff38e6414486a5942d5c29d Author: Justin Bertram AuthorDate: Fri May 3 12:10:05 2024 -0500 NO-JIRA clarify Artemis docs around queue auto-creation --- .../documentation/latest/address-model.html| 16 +- .../documentation/latest/address-settings.html | 22 +++- .../documentation/latest/jms-core-mapping.html | 58 +++--- 3 files changed, 74 insertions(+), 22 deletions(-) diff --git a/src/components/artemis/documentation/latest/address-model.html b/src/components/artemis/documentation/latest/address-model.html index 1707626e8..cd9e6fa7e 100644 --- a/src/components/artemis/documentation/latest/address-model.html +++ b/src/components/artemis/documentation/latest/address-model.html @@ -194,6 +194,20 @@ This saves you from having to preconfigure each address and queue before a clien + + + + + + + +Automatic queue creation is for queues that would not otherwise be created during normal operation. +For example, when a remote application creates a consumer on a JMS topic then a queue will be created representing that subscription as described in the JMS-to-core mapping chapter. +This queue will be created regardless of how auto-create-queues is configured because it is required for normal operation. + + + + See the documentation on address settings for more details on these elements. @@ -754,4 +768,4 @@ If no _AMQ_ROUTING_TYPE is set then the message will be routed to a - \ No newline at end of file + diff --git a/src/components/artemis/documentation/latest/address-settings.html b/src/components/artemis/documentation/latest/address-settings.html index e581268c6..552e74a49 100644 --- a/src/components/artemis/documentation/latest/address-settings.html +++ b/src/components/artemis/documentation/latest/address-settings.html @@ -336,13 +336,31 @@ Default is true. -automatic queue creation does not work for the core client. +Automatic queue creation does not work for the core client. The core API is a low-level API and is not meant to have such automation. + + + + + + + + + +Automatic queue creation is for queues that would not otherwise be created during normal operation. +For example, when a remote application creates a consumer on a JMS topic then a queue will be created representing that subscription as described in the JMS-to-core mapping chapter. +This queue will be created regardless of how auto-create-queues is configured because it is required for normal operation. + + + + + + auto-delete-queues Whether or not the broker should automatically delete auto-created queues when they have both 0 consumers and the message count is less than or equal to auto-delete-queues-message-count. @@ -584,4 +602,4 @@ elements if not explicitly configured. Read more about - + Mapping JMS Concepts to the Core API + +User Manual for 2.33.0 + +1. JMS Topic +2. JMS Queue + + -This chapter describes how JMS destinations are mapped to Apache ActiveMQ Artemis addresses. +This chapter describes how JMS destinations are mapped to the Apache ActiveMQ Artemis address model. +If you havent already done so, please read about the address model as it introduces concepts which are referenced here. + + + + +1. JMS Topic + + +A JMS topic is implemented as a address where the name of the address is the same as the name of the JMS topic. + + +A subscription on that JMS topic is represented as a multicast queue on the corresponding address. The queue is named according to the whether the subscription is durable and according to the client ID and subscription named provided via the JMS API. -Apache ActiveMQ Artemis core is JMS-agnostic. -It does not have any concept of a JMS topic. -A JMS topic is implemented in core as an address with name=(the topic name) and with a MULTICAST routing type with zero or more queues bound to it. -Each queue bound to that address represents a topic subscription. +Typically there is just one consumer per queue, but there can be multiple consumers on a queue when using JMS shared topic subscriptions. +Any messages sent to the JMS topic is therefore routed to every multicast queue bound to the corresponding address and then dispatched to any consumers on those queues (i.e. JMS topic subscriber). +If there are no queues on the address then the message is simply dropped. -Likewise, a JMS queue is implemented as an address with name=(the JMS queue name) with an ANYCAST routing type associated with it. +This effectively achieves JMS pub/sub semantics. - - - - - - - -While it is possible to configure a JMS topic and queue
(activemq-artemis) branch main updated: NO-JIRA clarify docs around queue auto-creation
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new b2486db000 NO-JIRA clarify docs around queue auto-creation b2486db000 is described below commit b2486db000897287c7081d1dd7562bc017deb4c5 Author: Justin Bertram AuthorDate: Fri May 3 11:47:32 2024 -0500 NO-JIRA clarify docs around queue auto-creation --- docs/user-manual/_auto-queue-creation-note.adoc | 3 +++ docs/user-manual/address-model.adoc | 2 ++ docs/user-manual/address-settings.adoc | 4 +++- docs/user-manual/jms-core-mapping.adoc | 26 ++--- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/docs/user-manual/_auto-queue-creation-note.adoc b/docs/user-manual/_auto-queue-creation-note.adoc new file mode 100644 index 00..9d05d33c9a --- /dev/null +++ b/docs/user-manual/_auto-queue-creation-note.adoc @@ -0,0 +1,3 @@ +NOTE: Automatic queue creation is for queues that _would not otherwise be created during normal operation_. +For example, when a remote application creates a consumer on a JMS topic then a queue will be created representing that subscription as described in the xref:jms-core-mapping.adoc[JMS-to-core mapping chapter]. +This queue will be created regardless of how `auto-create-queues` is configured because it is required for _normal operation_. \ No newline at end of file diff --git a/docs/user-manual/address-model.adoc b/docs/user-manual/address-model.adoc index 6a50770311..92f6a3b02b 100644 --- a/docs/user-manual/address-model.adoc +++ b/docs/user-manual/address-model.adoc @@ -62,6 +62,8 @@ Automatic creation and deletion is configured on a per address basis and is cont * `auto-delete-queues` * `default-queue-routing-type` +include::_auto-queue-creation-note.adoc[] + See xref:address-settings.adoc#address-settings[the documentation on address settings] for more details on these elements. Of course, automatic configuration can be disabled and everything can be configured manually. diff --git a/docs/user-manual/address-settings.adoc b/docs/user-manual/address-settings.adoc index b810e519f6..3455d7bead 100644 --- a/docs/user-manual/address-settings.adoc +++ b/docs/user-manual/address-settings.adoc @@ -247,9 +247,11 @@ Whether or not the broker should automatically create a queue when a message is Queues which are auto-created are durable, non-temporary, and non-transient. Default is `true`. + -NOTE: automatic queue creation does _not_ work for the core client. +NOTE: Automatic queue creation does _not_ work for the core client. The core API is a low-level API and is not meant to have such automation. +include::_auto-queue-creation-note.adoc[] + auto-delete-queues:: Whether or not the broker should automatically delete auto-created queues when they have both 0 consumers and the message count is less than or equal to `auto-delete-queues-message-count`. Default is `true`. diff --git a/docs/user-manual/jms-core-mapping.adoc b/docs/user-manual/jms-core-mapping.adoc index 93442632aa..3d29681c17 100644 --- a/docs/user-manual/jms-core-mapping.adoc +++ b/docs/user-manual/jms-core-mapping.adoc @@ -2,13 +2,25 @@ :idprefix: :idseparator: - -This chapter describes how JMS destinations are mapped to Apache ActiveMQ Artemis addresses. +This chapter describes how JMS destinations are mapped to the Apache ActiveMQ Artemis address model. +If you haven't already done so, please read about the xref:address-model.adoc[address model] as it introduces concepts which are referenced here. -Apache ActiveMQ Artemis core is JMS-agnostic. -It does not have any concept of a JMS topic. -A JMS topic is implemented in core as an address with name=(the topic name) and with a MULTICAST routing type with zero or more queues bound to it. -Each queue bound to that address represents a topic subscription. +== JMS Topic -Likewise, a JMS queue is implemented as an address with name=(the JMS queue name) with an ANYCAST routing type associated with it. +A JMS topic is implemented as a xref:address-model.adoc#address[*address*] where the name of the address is the same as the name of the JMS topic. -NOTE: While it is possible to configure a JMS topic and queue with the same name, it is not a recommended configuration for use with cross protocol. +A subscription on that JMS topic is represented as a xref:address-model.adoc#multicast[*multicast*] xref:address-model.adoc#queue[*queue*] on the corresponding address. The queue is named according to the whether the subscription is durable and according to the client ID and subscription named provided via the JMS API. + +Typically there is just one consumer per queue, but there can be multiple consumers on a queue when using JMS shared topic subscriptions. +Any messages sent to the JMS topic
(activemq-artemis) branch main updated: ARTEMIS-4746 Simplifying switch case on JMSExceptionHelper
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new b50f01b02b ARTEMIS-4746 Simplifying switch case on JMSExceptionHelper
b50f01b02b is described below
commit b50f01b02b4c829e7330980837629951eeafb304
Author: Clebert Suconic
AuthorDate: Sun Apr 28 14:32:07 2024 -0400
ARTEMIS-4746 Simplifying switch case on JMSExceptionHelper
---
.../artemis/jms/client/JMSExceptionHelper.java | 25 +-
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JMSExceptionHelper.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JMSExceptionHelper.java
index 1a8456fde3..f90c68d063 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JMSExceptionHelper.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/JMSExceptionHelper.java
@@ -39,45 +39,30 @@ public final class JMSExceptionHelper {
JMSException je;
switch (me.getType()) {
case CONNECTION_TIMEDOUT:
-je = new JMSException(me.getMessage());
-break;
-
- case ILLEGAL_STATE:
-je = new javax.jms.IllegalStateException(me.getMessage());
-break;
-
case INTERNAL_ERROR:
-je = new JMSException(me.getMessage());
-break;
-
- case INVALID_FILTER_EXPRESSION:
-je = new InvalidSelectorException(me.getMessage());
-break;
-
case NOT_CONNECTED:
je = new JMSException(me.getMessage());
break;
+ case UNSUPPORTED_PACKET:
case OBJECT_CLOSED:
+ case ILLEGAL_STATE:
je = new javax.jms.IllegalStateException(me.getMessage());
break;
case QUEUE_DOES_NOT_EXIST:
+ case QUEUE_EXISTS:
je = new InvalidDestinationException(me.getMessage());
break;
- case QUEUE_EXISTS:
-je = new InvalidDestinationException(me.getMessage());
+ case INVALID_FILTER_EXPRESSION:
+je = new InvalidSelectorException(me.getMessage());
break;
case SECURITY_EXCEPTION:
je = new JMSSecurityException(me.getMessage());
break;
- case UNSUPPORTED_PACKET:
-je = new javax.jms.IllegalStateException(me.getMessage());
-break;
-
case TRANSACTION_ROLLED_BACK:
je = new javax.jms.TransactionRolledBackException(me.getMessage());
break;
(activemq-artemis) branch main updated: ARTEMIS-1769 return JMS Session's ClientID via JMX
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 614b5cb32f ARTEMIS-1769 return JMS Session's ClientID via JMX
614b5cb32f is described below
commit 614b5cb32f8df9cd2824fdfe3b1e2cbdb44f2d6a
Author: Justin Bertram
AuthorDate: Sat Apr 13 22:57:02 2024 -0500
ARTEMIS-1769 return JMS Session's ClientID via JMX
---
.../core/management/impl/view/SessionView.java | 5 -
.../management/ActiveMQServerControlTest.java | 24 ++
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/SessionView.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/SessionView.java
index fedc96f44b..182d84285e 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/SessionView.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/SessionView.java
@@ -46,7 +46,8 @@ public class SessionView extends
ActiveMQAbstractView {
.add(SessionField.CREATION_TIME.getName(), new
Date(session.getCreationTime()).toString())
.add(SessionField.CONSUMER_COUNT.getName(),
session.getConsumerCount())
.add(SessionField.PRODUCER_COUNT.getName(),
session.getProducerCount())
- .add(SessionField.CONNECTION_ID.getName(),
session.getConnectionID().toString());
+ .add(SessionField.CONNECTION_ID.getName(),
session.getConnectionID().toString())
+ .add(SessionField.CLIENT_ID.getName(),
session.getRemotingConnection().getClientID());
return obj;
}
@@ -69,6 +70,8 @@ public class SessionView extends
ActiveMQAbstractView {
return session.getProducerCount();
case CONNECTION_ID:
return session.getConnectionID();
+ case CLIENT_ID:
+return session.getRemotingConnection().getClientID();
default:
throw new IllegalArgumentException("Unsupported field, " +
fieldName);
}
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 c7ad640605..be1cb95741 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,7 @@ import
org.apache.activemq.artemis.core.config.impl.SecurityConfiguration;
import org.apache.activemq.artemis.core.management.impl.view.ConnectionField;
import org.apache.activemq.artemis.core.management.impl.view.ConsumerField;
import org.apache.activemq.artemis.core.management.impl.view.ProducerField;
+import org.apache.activemq.artemis.core.management.impl.view.SessionField;
import
org.apache.activemq.artemis.core.messagecounter.impl.MessageCounterManagerImpl;
import org.apache.activemq.artemis.core.persistence.OperationContext;
import
org.apache.activemq.artemis.core.persistence.config.PersistedDivertConfiguration;
@@ -4330,6 +4331,29 @@ public class ActiveMQServerControlTest extends
ManagementTestBase {
}
}
+ @Test
+ public void testListSessionsJmsClientID() throws Exception {
+ final String clientId = RandomUtil.randomString();
+
+ ActiveMQServerControl serverControl = createManagementControl();
+
+ ConnectionFactory cf = new ActiveMQConnectionFactory("vm://0");
+ try (Connection c = cf.createConnection()) {
+ c.setClientID(clientId);
+ c.createSession();
+ String filter = createJsonFilter(SessionField.CLIENT_ID.getName(),
"EQUALS", clientId);
+ String json = serverControl.listSessions(filter, 1, 50);
+ System.out.println(json);
+ JsonObject sessions = JsonUtil.readJsonObject(json);
+ JsonArray array = (JsonArray) sessions.get("data");
+
+ Assert.assertEquals("number of sessions returned from query", 2,
array.size());
+ JsonObject jsonSession = array.getJsonObject(0);
+
+ Assert.assertEquals("wrong client ID returned", clientId,
jsonSession.getString(SessionField.CLIENT_ID.getName()));
+ }
+ }
+
@RetryMethod(retries = 2) // the list of connections eventually comes from
a hashmap on a different order. Which is fine but makes the test fail. a Retry
is ok
@Test
public void testListConnections() throws Exception {
(activemq-artemis) branch main updated: ARTEMIS-4740 reduce unnecessary boxing
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new fc6f0ee9ec ARTEMIS-4740 reduce unnecessary boxing fc6f0ee9ec is described below commit fc6f0ee9ec85ce4223296a195bc35899cbecb091 Author: Justin Bertram AuthorDate: Mon Apr 22 14:43:50 2024 -0500 ARTEMIS-4740 reduce unnecessary boxing --- .../artemis/cli/commands/tools/PrintData.java | 6 +-- .../apache/activemq/artemis/util/ServerUtil.java | 4 +- .../org/apache/activemq/cli/test/ArtemisTest.java | 32 ++-- .../apache/activemq/artemis/utils/ByteUtil.java| 8 +-- .../apache/activemq/artemis/utils/PairTest.java| 2 +- .../artemis/api/core/client/ActiveMQClient.java| 2 +- .../serverLocator/TCPServerLocatorSchema.java | 2 +- .../artemis/utils/ConfigurationHelper.java | 4 +- .../activemq/artemis/utils/VersionLoader.java | 6 +-- .../jdbc/store/sql/PropertySQLProvider.java| 2 +- .../jms/client/ActiveMQConnectionMetaData.java | 4 +- .../artemis/protocol/amqp/broker/AMQPMessage.java | 18 +++ .../protocol/amqp/broker/AMQPMessageTest.java | 6 +-- .../protocol/amqp/converter/TestConversions.java | 8 +-- .../converter/message/AMQPMessageIdHelperTest.java | 4 +- .../core/protocol/mqtt/MQTTPublishManager.java | 2 +- .../protocol/openwire/OpenWireProtocolManager.java | 4 +- .../protocol/stomp/v11/StompFrameHandlerV11.java | 10 ++-- .../artemis/ra/ActiveMQRAConnectionMetaData.java | 4 +- .../selector/filter/ComparisonExpression.java | 42 .../selector/filter/ConstantExpression.java| 12 ++--- .../artemis/selector/filter/UnaryExpression.java | 2 +- .../artemis/core/filter/impl/FilterImpl.java | 2 +- .../management/impl/ActiveMQServerControlImpl.java | 2 +- .../core/management/impl/QueueControlImpl.java | 2 +- .../paging/cursor/impl/PageSubscriptionImpl.java | 4 +- .../core/paging/impl/PagingManagerImpl.java| 2 +- .../management/impl/ManagementServiceImpl.java | 58 +++--- .../routing/policies/LeastConnectionsPolicy.java | 2 +- .../server/impl/ScheduledDeliveryHandlerTest.java | 4 +- .../policies/ConsistentHashModuloPolicyTest.java | 4 +- .../apache/activemq/broker/BrokerBenchmark.java| 6 +-- .../MultiThreadRandomReattachTestBase.java | 8 +-- .../stomp/util/AbstractStompClientConnection.java | 2 +- .../artemis/tests/util/ActiveMQTestBase.java | 6 +-- .../transport/amqp/client/AmqpSupport.java | 2 +- .../amqp/client/util/TypeConversionSupport.java| 10 ++-- .../artemis/tests/db/paging/PagingTest.java| 6 +-- .../tests/integration/amqp/JMXManagementTest.java | 2 +- .../integration/amqp/connect/AckManagerTest.java | 2 +- .../amqp/connect/SNFPagedMirrorTest.java | 2 +- .../client/LargeMessageCompressTest.java | 2 +- .../cluster/bridge/BridgeReconnectTest.java| 4 +- .../integration/cluster/bridge/BridgeTest.java | 2 +- .../PagedSNFTopicDistributionTest.java | 2 +- .../crossprotocol/RequestReplyNonJMSTest.java | 12 ++--- .../jdbc/store/journal/JDBCJournalTest.java| 2 +- .../mqtt5/spec/controlpackets/PublishTests.java| 2 +- .../openwire/interop/GeneralInteropTest.java | 16 +++--- .../persistence/XmlImportExportTest.java | 2 +- .../integration/plugin/MetricsPluginTest.java | 4 +- .../integration/replication/ReplicationTest.java | 4 +- .../tests/integration/server/ScaleDownTest.java| 2 +- .../tests/message/BodyIsAssignableFromTest.java| 8 +-- .../jms/tests/message/BytesMessageTest.java| 4 +- .../artemis/jms/tests/message/MapMessageTest.java | 4 +- .../artemis/jms/tests/message/MessageBodyTest.java | 42 .../jms/tests/message/MessageHeaderTest.java | 14 +++--- .../message/MessagePropertyConversionTest.java | 12 ++--- .../artemis/jms/tests/message/MessageTestBase.java | 4 +- .../jms/tests/message/SimpleJMSMapMessage.java | 16 +++--- .../jms/tests/message/SimpleJMSMessage.java| 28 +-- .../jms/tests/message/SimpleJMSStreamMessage.java | 16 +++--- .../jms/tests/message/StreamMessageTest.java | 4 +- .../tools/container/InVMInitialContextFactory.java | 4 +- .../artemis/jms/tests/util/JNDIUtilTest.java | 6 +-- .../jms/conform/message/MessageTypeTest.java | 2 +- .../message/properties/MessagePropertyTest.java| 2 +- .../core/postoffice/impl/BindingsImplTest.java | 2 +- .../impl/WildcardAddressManagerUnitTest.java | 2 +- 70 files changed, 267 insertions(+), 267 deletions(-) diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/PrintData.java b/artemis-cli/src/main
(activemq-artemis) branch main updated: ARTEMIS-4734 mitigate NPE in ReplicationManager
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 934fe24e5c ARTEMIS-4734 mitigate NPE in ReplicationManager
934fe24e5c is described below
commit 934fe24e5c03f4801e8a3934cc02bbc10f0325ff
Author: Justin Bertram
AuthorDate: Mon Apr 22 13:07:07 2024 -0500
ARTEMIS-4734 mitigate NPE in ReplicationManager
---
.../apache/activemq/artemis/core/replication/ReplicationManager.java | 3 +++
.../org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java | 3 +++
2 files changed, 6 insertions(+)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
index f6402bfe55..9bbbf46e3a 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
@@ -462,6 +462,9 @@ public final class ReplicationManager implements
ActiveMQComponent {
}
final OperationContext repliToken =
OperationContextImpl.getContext(ioExecutorFactory);
+ if (repliToken == null) {
+ throw
ActiveMQMessageBundle.BUNDLE.replicationFailureRepliTokenNull(packet.toString(),
ioExecutorFactory.toString());
+ }
if (lineUp) {
repliToken.replicationLineUp();
}
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
index bf2cf7491c..63f3956bab 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
@@ -548,4 +548,7 @@ public interface ActiveMQMessageBundle {
@Message(id = 229252, value = "Invalid HAPolicy property: {}")
RuntimeException unsupportedHAPolicyPropertyType(String invalidHAPolicy);
+
+ @Message(id = 229253, value = "Unable to acquire OperationContext when
replicating packet: {}. ExecutorFactory: {}")
+ IllegalStateException replicationFailureRepliTokenNull(String packet,
String executorFactory);
}
(activemq-artemis) branch main updated: ARTEMIS-4705 remove unnecessary field from STOMP HeartBeater
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 61e52ae0fd ARTEMIS-4705 remove unnecessary field from STOMP HeartBeater 61e52ae0fd is described below commit 61e52ae0fde45d53a068b752f3e5e4f4127876ba Author: Justin Bertram AuthorDate: Fri Apr 19 23:51:46 2024 -0500 ARTEMIS-4705 remove unnecessary field from STOMP HeartBeater --- .../activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java | 1 - 1 file changed, 1 deletion(-) diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java index 1e8d712fdd..12b910ce0c 100644 --- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java @@ -268,7 +268,6 @@ public class StompFrameHandlerV11 extends VersionedStompFrameHandler implements long serverPingPeriod = 0; long clientPingResponse; - volatile boolean shutdown = false; AtomicLong lastPingTimestamp = new AtomicLong(0); ConnectionEntry connectionEntry;
(activemq-artemis) branch main updated: ARTEMIS-4709 plugin to enforce connection periodic expiry per acceptor
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 20f345dbe1 ARTEMIS-4709 plugin to enforce connection periodic expiry
per acceptor
20f345dbe1 is described below
commit 20f345dbe18de05aabd80c1601113d2781a1c4a8
Author: Gary Tully
AuthorDate: Tue Apr 2 11:21:03 2024 +0100
ARTEMIS-4709 plugin to enforce connection periodic expiry per acceptor
---
.../impl/ConnectionPeriodicExpiryPlugin.java | 150
.../core/config/impl/ConfigurationImplTest.java| 43
.../impl/ConnectionPeriodicExpiryPluginTest.java | 267 +
docs/user-manual/broker-plugins.adoc | 27 +++
.../ConnectionPeriodicExpiryPluginTest.java| 89 +++
5 files changed, 576 insertions(+)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/ConnectionPeriodicExpiryPlugin.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/ConnectionPeriodicExpiryPlugin.java
new file mode 100644
index 00..4761ec5680
--- /dev/null
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/ConnectionPeriodicExpiryPlugin.java
@@ -0,0 +1,150 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.core.server.plugin.impl;
+
+import java.lang.invoke.MethodHandles;
+import java.util.Map;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
+
+import org.apache.activemq.artemis.api.core.ActiveMQDisconnectedException;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptor;
+import
org.apache.activemq.artemis.core.remoting.impl.netty.NettyServerConnection;
+import org.apache.activemq.artemis.core.remoting.server.RemotingService;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.plugin.ActiveMQServerBasePlugin;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.spi.core.remoting.Acceptor;
+import org.apache.activemq.artemis.utils.RandomUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ConnectionPeriodicExpiryPlugin implements
ActiveMQServerBasePlugin {
+
+ private static final Logger logger =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ private String name;
+ private long periodSeconds;
+ private int accuracyWindowSeconds;
+ private String acceptorMatchRegex;
+
+ private ScheduledExecutorService executor;
+ private RemotingService remotingService;
+ private Pattern matchPattern;
+ private ScheduledFuture task;
+
+ public ConnectionPeriodicExpiryPlugin() {
+ periodSeconds = TimeUnit.MINUTES.toSeconds(15);
+ accuracyWindowSeconds = 30;
+ }
+
+ @Override
+ public void registered(ActiveMQServer server) {
+
+ sanityCheckConfig();
+
+ executor = server.getScheduledPool();
+ remotingService = server.getRemotingService();
+ matchPattern = Pattern.compile(acceptorMatchRegex);
+
+ task = executor.scheduleWithFixedDelay(() -> {
+ try {
+final long currentTime = System.currentTimeMillis();
+for (Acceptor acceptor : remotingService.getAcceptors().values()) {
+ if (matchPattern.matcher(acceptor.getName()).matches()) {
+ if (acceptor instanceof NettyAcceptor) {
+ NettyAcceptor nettyAcceptor = (NettyAcceptor) acceptor;
+
+ for (NettyServerConnection nettyServerConnection :
nettyAcceptor.getConnections().values()) {
+RemotingConnection remotingConnection =
remotingService.getConnection(nettyServerConnection.getID());
+if (remotingConnection != null && currentTime >
remotingConnection.getCreationTime() + periodSeconds) {
+
(activemq-artemis) branch main updated: ARTEMIS-4727 fix STOMP durable sub doc and property precedence
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new ed59b0ea91 ARTEMIS-4727 fix STOMP durable sub doc and property
precedence
ed59b0ea91 is described below
commit ed59b0ea91e6238933143a9269d8dd80babf8e0a
Author: Justin Bertram
AuthorDate: Tue Apr 16 09:27:05 2024 -0500
ARTEMIS-4727 fix STOMP durable sub doc and property precedence
---
.../core/protocol/stomp/VersionedStompFrameHandler.java| 10 +-
docs/user-manual/stomp.adoc| 6 --
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java
index b4cd5ead7b..ac94d233ed 100644
---
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java
+++
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java
@@ -261,12 +261,12 @@ public abstract class VersionedStompFrameHandler {
String selector = frame.getHeader(Stomp.Headers.Subscribe.SELECTOR);
String ack = frame.getHeader(Stomp.Headers.Subscribe.ACK_MODE);
String id = frame.getHeader(Stomp.Headers.Subscribe.ID);
- String durableSubscriptionName =
frame.getHeader(Stomp.Headers.Subscribe.DURABLE_SUBSCRIBER_NAME);
+ String durableSubscriptionName =
frame.getHeader(Stomp.Headers.Subscribe.DURABLE_SUBSCRIPTION_NAME);
if (durableSubscriptionName == null) {
- durableSubscriptionName =
frame.getHeader(Stomp.Headers.Subscribe.DURABLE_SUBSCRIPTION_NAME);
- }
- if (durableSubscriptionName == null) {
- durableSubscriptionName =
frame.getHeader(Stomp.Headers.Subscribe.ACTIVEMQ_DURABLE_SUBSCRIPTION_NAME);
+ durableSubscriptionName =
frame.getHeader(Stomp.Headers.Subscribe.DURABLE_SUBSCRIBER_NAME);
+ if (durableSubscriptionName == null) {
+durableSubscriptionName =
frame.getHeader(Stomp.Headers.Subscribe.ACTIVEMQ_DURABLE_SUBSCRIPTION_NAME);
+ }
}
RoutingType routingType =
getRoutingType(frame.getHeader(Headers.Subscribe.SUBSCRIPTION_TYPE),
frame.getHeader(Headers.Subscribe.DESTINATION));
boolean noLocal = false;
diff --git a/docs/user-manual/stomp.adoc b/docs/user-manual/stomp.adoc
index 706c428a9b..d04cf209c2 100644
--- a/docs/user-manual/stomp.adoc
+++ b/docs/user-manual/stomp.adoc
@@ -208,10 +208,12 @@ The combination of these two headers will form the
identity of the durable subsc
To delete a durable subscription the `client-id` header must be set on the
`CONNECT` frame and the `durable-subscription-name` must be set on the
`UNSUBSCRIBE` frame.
The values for these headers should match what was set on the `SUBSCRIBE`
frame to delete the corresponding durable subscription.
-Aside from `durable-subscription-name`, the broker also supports
`durable-subscriber-name` (a deprecated property used before
`durable-subscription-name`) as well as `activemq.subscriptionName` from
ActiveMQ "Classic".
+Aside from `durable-subscription-name`, the broker also supports
`durable-subscriber-name` (a deprecated property used before
`durable-subscription-name`) as well as `activemq.subscriptionName` from
ActiveMQ Classic.
This is the order of precedence if the frame contains more than one of these:
-1) `durable-subscriber-name` 2) `durable-subscription-name` 3)
`activemq.subscriptionName`
+. `durable-subscription-name`
+. `durable-subscriber-name`
+. `activemq.subscriptionName`
It is possible to pre-configure durable subscriptions since the STOMP
implementation creates the queue used for the durable subscription in a
deterministic way (i.e. using the format of `client-id`.`subscription-name`).
For example, if you wanted to configure a durable subscription on the address
`myAddress` with a client-id of `myclientid` and a subscription name of
`mysubscription` then configure the durable subscription:
(activemq-website) branch main updated: NO-JIRA fix typo in security doc
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new abef55689 NO-JIRA fix typo in security doc abef55689 is described below commit abef55689679ff59b213698a55fcdb2a661d1335 Author: Justin Bertram AuthorDate: Wed Apr 17 12:30:34 2024 -0500 NO-JIRA fix typo in security doc --- src/security-advisories.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security-advisories.md b/src/security-advisories.md index 86ad75713..345d58865 100644 --- a/src/security-advisories.md +++ b/src/security-advisories.md @@ -12,6 +12,6 @@ Details of security problems fixed in released versions of individual Apache Act Reporting new security problems with Apache ActiveMQ components -We strongly encourage people to report security problems privately using the security mailing list of the [ASF Security Team](https://www.apache.org/security/) before disclosing them in a public forum. Please note, the ASF Security Team cannot accept regular bug reports or other queries. Mail sent to tthem which does not relate to security problems in Apache software will be ignored. +We strongly encourage people to report security problems privately using the security mailing list of the [ASF Security Team](https://www.apache.org/security/) before disclosing them in a public forum. Please note, the ASF Security Team cannot accept regular bug reports or other queries. Mail which does not relate to security problems in Apache software will be ignored. General questions such as those about using ActiveMQ components or whether an exiting published vulnerability applies to your application, etc, should be sent via one of our [regular channels](contact).
(activemq-website) branch main updated: NO-JIRA clarify security doc
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new a1fa4000e NO-JIRA clarify security doc a1fa4000e is described below commit a1fa4000eeb7f6e8f6e54d8850ec086a2ad9136c Author: Justin Bertram AuthorDate: Wed Apr 17 12:29:46 2024 -0500 NO-JIRA clarify security doc --- src/security-advisories.md | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/security-advisories.md b/src/security-advisories.md index d0dab2897..86ad75713 100644 --- a/src/security-advisories.md +++ b/src/security-advisories.md @@ -12,10 +12,6 @@ Details of security problems fixed in released versions of individual Apache Act Reporting new security problems with Apache ActiveMQ components -We strongly encourage people to report security problems privately, using the security mailing list of the ASF Security Team, before disclosing them in a public forum. +We strongly encourage people to report security problems privately using the security mailing list of the [ASF Security Team](https://www.apache.org/security/) before disclosing them in a public forum. Please note, the ASF Security Team cannot accept regular bug reports or other queries. Mail sent to tthem which does not relate to security problems in Apache software will be ignored. -Please see the [ASF Security Team](https://www.apache.org/security/) pages for contact information and further detail on the process. - -The ASF Security Team cannot accept regular bug reports or other queries, mail sent to tthem which does not relate to security problems in Apache software will be ignored. - -General questions such as those about using ActiveMQ components, or whether an exiting published vulnerability applies to your application, etc, should be addressed to our regular channels, e.g the users mailing list. Please see the [contact](contact) page for details of how to subscribe. +General questions such as those about using ActiveMQ components or whether an exiting published vulnerability applies to your application, etc, should be sent via one of our [regular channels](contact).
(activemq-artemis) branch main updated: ARTEMIS-1729 automatically check for broken documentation links
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 66fcd7f4cf ARTEMIS-1729 automatically check for broken documentation
links
66fcd7f4cf is described below
commit 66fcd7f4cf554a833d0fe3ee7760d2e083e01fca
Author: Justin Bertram
AuthorDate: Fri Apr 12 11:04:09 2024 -0500
ARTEMIS-1729 automatically check for broken documentation links
---
artemis-website/pom.xml | 7 +++
docs/user-manual/configuration-index.adoc | 4 ++--
docs/user-manual/versions.adoc| 6 +++---
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/artemis-website/pom.xml b/artemis-website/pom.xml
index 279ec6d102..1bf90a39a6 100644
--- a/artemis-website/pom.xml
+++ b/artemis-website/pom.xml
@@ -383,6 +383,13 @@
${project.version}
${log4j.version}
+
+false
+
+
+ possible invalid
reference
+
+
diff --git a/docs/user-manual/configuration-index.adoc
b/docs/user-manual/configuration-index.adoc
index d46bdc5448..c4810c91d1 100644
--- a/docs/user-manual/configuration-index.adoc
+++ b/docs/user-manual/configuration-index.adoc
@@ -196,7 +196,7 @@ Please consult your specific configuration to know which
values will actually be
| The frequency in milliseconds the configuration file is checked for changes
| 5000
-| xref:ha.adoc#data-replication[check-for-live-server]
+| xref:ha.adoc#replication-configuration[check-for-active-server]
| Used by a primary server to verify if there are other nodes with the same ID
on the topology
| n/a
@@ -370,7 +370,7 @@ The system will create as many files as needed however when
reclaiming files it
If set to "true" the passwords are masked.
| `false`
-| xref:ha.adoc#data-replication[max-saved-replicated-journals-size]
+| xref:ha.adoc#replication-configuration[max-saved-replicated-journals-size]
| This specifies how many replication backup directories will be kept when
server starts as replica.
-1 Means no Limit;
0 don't keep a copy at all.
diff --git a/docs/user-manual/versions.adoc b/docs/user-manual/versions.adoc
index d03639eaad..4f0272b3c9 100644
--- a/docs/user-manual/versions.adoc
+++ b/docs/user-manual/versions.adoc
@@ -446,7 +446,7 @@
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315920
=== Highlights
-* New ability to replay xref:persistence.adoc#journal-retention[retained
journal] records via the management API.
+* New ability to replay
xref:persistence.adoc#journal-and-data-retention[retained journal] records via
the management API.
* New environment/system property to set the "key" for masked passwords when
using the xref:masking-passwords.adoc#the-default-codec[default codec].
* Ability to disable
xref:clusters.adoc#configuring-cluster-connections[message-load-balancing and
still allow redistribution] via the new `OFF_WITH_REDISTRIBUTION` type.
* MQTT session state can now be cleaned up automatically to avoid excessive
accumulation in situations where client's don't clean up their own sessions.
@@ -459,8 +459,8 @@
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315920
=== Highlights
* xref:amqp-broker-connections.adoc#dual-mirror-disaster-recovery[Dual Mirror]
support improving capabilities on AMQP Mirror for Disaster Recovery
-* xref:persistence.adoc#journal-retention[Journal Retention]
-* xref:ha.adoc#pluggable-quorum-vote-replication-configurations[Replication
integrated with ZooKeeper]
+* xref:persistence.adoc#journal-and-data-retention[Journal Retention]
+* xref:ha.adoc#apache-zookeeper-integration[Replication integrated with
ZooKeeper]
* xref:connection-routers.adoc#connection-routers[Connection Routers]
* xref:core-bridges.adoc#configuring-core-bridges[Concurrency] configuration
for core bridges.
* xref:filter-expressions.adoc#xpath[XPath filter expressions] (for parity
with ActiveMQ "Classic").
(activemq-artemis) branch main updated: ARTEMIS-1551 validate properties between JMS clients
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new f64e37622e ARTEMIS-1551 validate properties between JMS clients
f64e37622e is described below
commit f64e37622e3216be77d409b6327990f8fe4a7b00
Author: Justin Bertram
AuthorDate: Thu Apr 11 13:14:52 2024 -0500
ARTEMIS-1551 validate properties between JMS clients
---
.../multiprotocol/JMSMessagePropertiesTest.java| 136 +
1 file changed, 136 insertions(+)
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/multiprotocol/JMSMessagePropertiesTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/multiprotocol/JMSMessagePropertiesTest.java
new file mode 100644
index 00..7f2b69db41
--- /dev/null
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/multiprotocol/JMSMessagePropertiesTest.java
@@ -0,0 +1,136 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tests.integration.jms.multiprotocol;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import java.lang.invoke.MethodHandles;
+
+import org.apache.activemq.artemis.utils.RandomUtil;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class JMSMessagePropertiesTest extends
MultiprotocolJMSClientTestSupport {
+
+ protected static final Logger logger =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ @Test(timeout = 3)
+ public void testMessagePropertiesAMQPProducerCoreConsumer() throws
Exception {
+ testMessageProperties(createConnection(), createCoreConnection());
+ }
+
+ @Test(timeout = 3)
+ public void testMessagePropertiesAMQPProducerAMQPConsumer() throws
Exception {
+ testMessageProperties(createConnection(), createConnection());
+ }
+
+ @Test(timeout = 3)
+ public void testMessagePropertiesAMQPProducerOpenWireConsumer() throws
Exception {
+ testMessageProperties(createConnection(), createOpenWireConnection());
+ }
+
+ @Test(timeout = 3)
+ public void testMessagePropertiesCoreProducerAMQPConsumer() throws
Exception {
+ testMessageProperties(createCoreConnection(), createConnection());
+ }
+
+ @Test(timeout = 3)
+ public void testMessagePropertiesCoreProducerCoreConsumer() throws
Exception {
+ testMessageProperties(createCoreConnection(), createCoreConnection());
+ }
+
+ @Test(timeout = 3)
+ public void testMessagePropertiesCoreProducerOpenWireConsumer() throws
Exception {
+ testMessageProperties(createCoreConnection(),
createOpenWireConnection());
+ }
+
+ @Test(timeout = 3)
+ public void testMessagePropertiesOpenWireProducerAMQPConsumer() throws
Exception {
+ testMessageProperties(createOpenWireConnection(), createConnection());
+ }
+
+ @Test(timeout = 3)
+ public void testMessagePropertiesOpenWireProducerCoreConsumer() throws
Exception {
+ testMessageProperties(createOpenWireConnection(),
createCoreConnection());
+ }
+
+ @Test(timeout = 3)
+ public void testMessagePropertiesOpenWireProducerOpenWireConsumer() throws
Exception {
+ testMessageProperties(createOpenWireConnection(),
createOpenWireConnection());
+ }
+
+ private void testMessageProperties(Connection producerConnection,
Connection consumerConnection) throws JMSException {
+ final String stringPropertyName = "myStringProperty";
+ final String stringPropertyValue = RandomUtil.randomString();
+ final String intPropertyName = "myIntProperty";
+ final int intPropertyValue = RandomUtil.randomInt();
+ final String longPropertyName = "myLongProperty";
+ final long longPropertyValue = RandomUtil.randomLong();
+ final String shortPropertyName = "
(activemq-website) branch main updated: 5.17.x is not active so removing it from current releases
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new 021a32970 5.17.x is not active so removing it from current releases 021a32970 is described below commit 021a32970405d98b52f647cb838e7a91f4c2b5dc Author: Justin Bertram AuthorDate: Fri Apr 12 10:41:48 2024 -0500 5.17.x is not active so removing it from current releases --- src/_data/current_releases.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/_data/current_releases.yml b/src/_data/current_releases.yml index 68054daae..6c3bdb882 100644 --- a/src/_data/current_releases.yml +++ b/src/_data/current_releases.yml @@ -4,7 +4,6 @@ artemis: classic: - "6.1." - "5.18." - - "5.17." nms_amqp: - "2.2." nms_api:
svn commit: r68460 - /release/activemq/6.0.1/
Author: jbertram Date: Fri Apr 12 15:18:33 2024 New Revision: 68460 Log: branch no longer active so removing Removed: release/activemq/6.0.1/
svn commit: r68459 - /release/activemq/5.17.6/
Author: jbertram Date: Fri Apr 12 15:18:09 2024 New Revision: 68459 Log: branch no longer active so removing Removed: release/activemq/5.17.6/
(activemq-artemis) branch main updated: ARTEMIS-2492 remove defuct doc snippet
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new aff360c70e ARTEMIS-2492 remove defuct doc snippet aff360c70e is described below commit aff360c70ee48bfde106d55d30858156da2b9523 Author: Justin Bertram AuthorDate: Fri Apr 12 00:43:35 2024 -0500 ARTEMIS-2492 remove defuct doc snippet --- docs/user-manual/clusters.adoc | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/user-manual/clusters.adoc b/docs/user-manual/clusters.adoc index ff897722b7..6312a287bd 100644 --- a/docs/user-manual/clusters.adoc +++ b/docs/user-manual/clusters.adoc @@ -332,8 +332,6 @@ Use the `udp` URL scheme and a host:port combination matches the group-address a udp://231.7.7.7:9876 -The element `discovery-group-ref` specifies the name of a discovery group defined in `broker.xml`. - Connections created using this URI will be load-balanced across the list of servers that the discovery group maintains by listening on the multicast address specified in the discovery group configuration. The aforementioned `refreshTimeout` parameter can be set directly in the URI.
(activemq-artemis) branch main updated: ARTEMIS-4721 fix MQTT link in upgrade instructions
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 6e3c7e055d ARTEMIS-4721 fix MQTT link in upgrade instructions 6e3c7e055d is described below commit 6e3c7e055d80f82397dd427013fd234f1fdee029 Author: Justin Bertram AuthorDate: Thu Apr 11 09:14:04 2024 -0500 ARTEMIS-4721 fix MQTT link in upgrade instructions --- docs/user-manual/versions.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/versions.adoc b/docs/user-manual/versions.adoc index 82dc79678f..ea2f2853bb 100644 --- a/docs/user-manual/versions.adoc +++ b/docs/user-manual/versions.adoc @@ -51,7 +51,7 @@ https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315920 * Due to https://issues.apache.org/jira/browse/ARTEMIS-4532[ARTEMIS-4532] the names of addresses and queues related to MQTT topics and subscriptions respectively may change. This will impact MQTT use-cases if *both* of the following are true: + -. The broker is configured to use a xref:wildcard-syntax.adoc[wildcard syntax] which _doesn't match_ the xref:mqtt.adoc#wildcard-syntax[MQTT wildcard syntax] (e.g. the default wildcard syntax). +. The broker is configured to use a xref:wildcard-syntax.adoc[wildcard syntax] which _doesn't match_ the xref:mqtt.adoc#wildcard-subscriptions[MQTT wildcard syntax] (e.g. the default wildcard syntax). . You are using characters from the broker's wildcard syntax in your MQTT topic name or filter. For example, if you were using the default wildcard syntax and an MQTT topic named `1.0/group/device`. The dot (`.`) character here is part of the broker's wildcard syntax, and it is being used in the name of an MQTT topic.
(activemq-artemis) branch main updated: ARTEMIS-4721 mqtt doc fixes
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 221420b0b8 ARTEMIS-4721 mqtt doc fixes 221420b0b8 is described below commit 221420b0b82ed912818b74c9d38f1982fc019153 Author: Justin Bertram AuthorDate: Thu Apr 11 09:09:37 2024 -0500 ARTEMIS-4721 mqtt doc fixes --- docs/user-manual/mqtt.adoc | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/docs/user-manual/mqtt.adoc b/docs/user-manual/mqtt.adoc index 8b74af49bc..50ec3bfb7d 100644 --- a/docs/user-manual/mqtt.adoc +++ b/docs/user-manual/mqtt.adoc @@ -154,11 +154,15 @@ This conversion isn't free so *if you want the best MQTT performance* use `broke [,xml] - - / - # - * - + + ... + + / + # + + + + ... + Of course, changing the default syntax also means other clients on other protocols will need to follow this same syntax as well as the `match` values of your `address-setting` configuration elements.
(activemq-artemis) branch main updated: ARTEMIS-1634 unintentional integer overflow
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new b2ffe9ff57 ARTEMIS-1634 unintentional integer overflow
b2ffe9ff57 is described below
commit b2ffe9ff5743cf65bfd5b60a5e25951cd36fa547
Author: Justin Bertram
AuthorDate: Wed Apr 10 22:42:29 2024 -0500
ARTEMIS-1634 unintentional integer overflow
---
.../apache/activemq/artemis/core/management/impl/QueueControlImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
index 4dae496fbd..c45627dc2c 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
@@ -1696,7 +1696,7 @@ public class QueueControlImpl extends AbstractControl
implements QueueControl {
try {
long index = 0;
long start = (long) (page - 1) * pageSize;
-long end = Math.min(page * pageSize, queue.getMessageCount());
+long end = Math.min((long) page * pageSize,
queue.getMessageCount());
ArrayList c = new ArrayList<>();
Filter thefilter = FilterImpl.createFilter(filter);
(activemq-artemis) branch main updated: ARTEMIS-4675 fix test
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 6976c075be ARTEMIS-4675 fix test
6976c075be is described below
commit 6976c075bebc4f8cfaa2b060157ad907f8ddca87
Author: Justin Bertram
AuthorDate: Wed Apr 10 13:26:52 2024 -0500
ARTEMIS-4675 fix test
---
.../activemq/artemis/tests/integration/plugin/MetricsPluginTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/MetricsPluginTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/MetricsPluginTest.java
index 74678c15b3..7839a4803b 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/MetricsPluginTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/MetricsPluginTest.java
@@ -169,7 +169,8 @@ public class MetricsPluginTest extends ActiveMQTestBase {
new Metric("artemis.address.size", "the number of estimated
bytes being used by all the queue(s) bound to this address; used to control
paging and blocking", 0.0),
new Metric("artemis.address.size", "the number of estimated
bytes being used by all the queue(s) bound to this address; used to control
paging and blocking", 0.0),
new Metric("artemis.number.of.pages", "number of pages used by
this address", 0.0),
- new Metric("artemis.number.of.pages", "number of pages used by
this address", 0.0)
+ new Metric("artemis.active", "If the server is active", 1.0),
+ new Metric("artemis.replica.sync", "If the initial replication
synchronization process is complete", 0.0)
));
}
(activemq-artemis) branch main updated: NO-JIRA fix security doc typo
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 638ebbd01e NO-JIRA fix security doc typo 638ebbd01e is described below commit 638ebbd01e2c4cc26a1850f73b5ed8726a987827 Author: Justin Bertram AuthorDate: Wed Apr 10 10:13:16 2024 -0500 NO-JIRA fix security doc typo --- docs/user-manual/security.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/security.adoc b/docs/user-manual/security.adoc index 5c92cb4ae4..3876283b1a 100644 --- a/docs/user-manual/security.adoc +++ b/docs/user-manual/security.adoc @@ -381,7 +381,7 @@ In short, the file defines: * an alias for an entry (e.g. `PropertiesLogin`) * the implementation class for the login module (e.g. `org.apache.activemq.artemis.spi.core.security.jaas.PropertiesLoginModule`) -* a flag which indicates whether the success of the login module is `required`, `requisite`, `sufficient`, or `optional` (see more details on these flags in the https://docs.oracle.com/javase/8/docs/api/javax/security/auth/login/Configuration.html[JavaDoc] +* a flag which indicates whether the success of the login module is `required`, `requisite`, `sufficient`, or `optional` (see more details on these flags in the https://docs.oracle.com/javase/8/docs/api/javax/security/auth/login/Configuration.html[JavaDoc]) * a list of configuration options specific to the login module implementation By default, the location and name of `login.config` is specified on the Artemis command-line which is set by `etc/artemis.profile` on linux and `etc\artemis.profile.cmd` on Windows.
(activemq-artemis) branch main updated: ARTEMIS-4675 Add replication status metrics
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new b9c919821b ARTEMIS-4675 Add replication status metrics
new 9ea27c15a2 This closes #4844
b9c919821b is described below
commit b9c919821beea8ca501b7cc30d61866332590629
Author: Alvin Kwekel
AuthorDate: Wed Mar 6 17:25:15 2024 +0100
ARTEMIS-4675 Add replication status metrics
---
.../activemq/artemis/api/core/management/ActiveMQServerControl.java | 6 --
.../artemis/core/server/management/impl/ManagementServiceImpl.java | 2 ++
.../activemq/artemis/core/server/metrics/BrokerMetricNames.java | 2 ++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
index 4d2cea380e..b8633e8c79 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
@@ -31,6 +31,8 @@ public interface ActiveMQServerControl {
String ADDRESS_MEMORY_USAGE_DESCRIPTION = "Memory used by all the addresses
on broker for in-memory messages";
String ADDRESS_MEMORY_USAGE_PERCENTAGE_DESCRIPTION = "Memory used by all
the addresses on broker as a percentage of the global-max-size";
String DISK_STORE_USAGE_DESCRIPTION = "Fraction of total disk store used";
+ String REPLICA_SYNC_DESCRIPTION = "If the initial replication
synchronization process is complete";
+ String IS_ACTIVE_DESCRIPTION = "If the server is active";
/**
* Returns this server's name.
@@ -48,7 +50,7 @@ public interface ActiveMQServerControl {
String getVersion();
- @Attribute(desc = "Server is active")
+ @Attribute(desc = IS_ACTIVE_DESCRIPTION)
boolean isActive();
/**
@@ -470,7 +472,7 @@ public interface ActiveMQServerControl {
* Returns whether the initial replication synchronization process with the
backup server is complete; applicable for
* either the primary or backup server.
*/
- @Attribute(desc = "Whether the initial replication synchronization process
with the backup server is complete")
+ @Attribute(desc = REPLICA_SYNC_DESCRIPTION)
boolean isReplicaSync();
/**
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
index bd514e61f6..60d7a785cc 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
@@ -241,6 +241,8 @@ public class ManagementServiceImpl implements
ManagementService {
builder.build(BrokerMetricNames.ADDRESS_MEMORY_USAGE,
messagingServer, metrics ->
Double.valueOf(messagingServerControl.getAddressMemoryUsage()),
ActiveMQServerControl.ADDRESS_MEMORY_USAGE_DESCRIPTION);
builder.build(BrokerMetricNames.ADDRESS_MEMORY_USAGE_PERCENTAGE,
messagingServer, metrics ->
Double.valueOf(messagingServerControl.getAddressMemoryUsagePercentage()),
ActiveMQServerControl.ADDRESS_MEMORY_USAGE_PERCENTAGE_DESCRIPTION);
builder.build(BrokerMetricNames.DISK_STORE_USAGE, messagingServer,
metrics -> Double.valueOf(messagingServer.getDiskStoreUsage()),
ActiveMQServerControl.DISK_STORE_USAGE_DESCRIPTION);
+builder.build(BrokerMetricNames.REPLICA_SYNC, messagingServer,
metrics -> messagingServer.isReplicaSync() ? 1D : 0D,
ActiveMQServerControl.REPLICA_SYNC_DESCRIPTION);
+builder.build(BrokerMetricNames.ACTIVE, messagingServer, metrics
-> messagingServer.isActive() ? 1D : 0D,
ActiveMQServerControl.IS_ACTIVE_DESCRIPTION);
});
}
}
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/metrics/BrokerMetricNames.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/metrics/BrokerMetricNames.java
index 44da0787ba..a31db9619e 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/metrics/BrokerMetricNames.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/metrics/BrokerMetricNames.java
@@ -23,4 +23,6 @@ public class BrokerMetricNames {
public static final String ADDRESS_MEMORY_USAGE = "address.memory.usage";
public static final String ADDRESS_MEMORY_USAGE_P
(activemq-artemis) branch main updated: ARTEMIS-4711 removing the dependency on JMS code by XmlDataImporter
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 604c6d3d90 ARTEMIS-4711 removing the dependency on JMS code by
XmlDataImporter
new 144852b85f This closes #4872
604c6d3d90 is described below
commit 604c6d3d90be437282ce58b33111b48ae193a4cf
Author: Emmanuel Hugonnet
AuthorDate: Wed Apr 3 11:59:15 2024 +0200
ARTEMIS-4711 removing the dependency on JMS code by XmlDataImporter
Introducing ConnectionConfigurationAbtract to expose the configuration
to connect to a broker without requiring the JMS code.
Signed-off-by: Emmanuel Hugonnet
---
.../commands/messages/BasicConnectionAbstract.java | 136 +
...ct.java => ConnectionConfigurationAbtract.java} | 92 ++
.../cli/commands/tools/xml/XmlDataImporter.java| 4 +-
3 files changed, 15 insertions(+), 217 deletions(-)
diff --git
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/BasicConnectionAbstract.java
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/BasicConnectionAbstract.java
index 90eab63834..7ed9b1ac62 100644
---
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/BasicConnectionAbstract.java
+++
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/BasicConnectionAbstract.java
@@ -22,98 +22,9 @@ import javax.jms.JMSException;
import javax.jms.JMSSecurityException;
import org.apache.activemq.artemis.api.core.management.ManagementHelper;
-import org.apache.activemq.artemis.cli.Shell;
-import org.apache.activemq.artemis.cli.commands.ActionContext;
-import org.apache.activemq.artemis.cli.commands.InputAbstract;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
-import picocli.CommandLine.Option;
-public class BasicConnectionAbstract extends InputAbstract {
- @Option(names = "--url", description = "Connection URL. Default: build URL
from the 'artemis' acceptor defined in the broker.xml or tcp://localhost:61616
if the acceptor cannot be parsed.")
- protected String brokerURL = DEFAULT_BROKER_URL;
-
- @Option(names = "--acceptor", description = "Name used to find the default
connection URL on the acceptor list. If an acceptor with that name cannot be
found the CLI will look for a connector with the same name.")
- protected String acceptor;
-
- @Option(names = "--user", description = "User used to connect.")
- protected String user;
-
- @Option(names = "--password", description = "Password used to connect.")
- protected String password;
-
- protected static ThreadLocal CONNECTION_INFORMATION
= new ThreadLocal<>();
-
- static class ConnectionInformation {
- String uri, user, password;
-
- private ConnectionInformation(String uri, String user, String password) {
- this.uri = uri;
- this.user = user;
- this.password = password;
- }
- }
-
- public String getBrokerURL() {
- return brokerURL;
- }
-
- public void setBrokerURL(String brokerURL) {
- this.brokerURL = brokerURL;
- }
-
- public String getAcceptor() {
- return acceptor;
- }
-
- public BasicConnectionAbstract setAcceptor(String acceptor) {
- this.acceptor = acceptor;
- return this;
- }
-
- public String getUser() {
- return user;
- }
-
- public BasicConnectionAbstract setUser(String user) {
- this.user = user;
- return this;
- }
-
- public String getPassword() {
- return password;
- }
-
- public BasicConnectionAbstract setPassword(String password) {
- this.password = password;
- return this;
- }
-
- @SuppressWarnings("StringEquality")
- @Override
- public Object execute(ActionContext context) throws Exception {
- super.execute(context);
-
- recoverConnectionInformation();
-
- // it is intentional to make a comparison on the String object here
- // this is to test if the original option was switched or not.
- // we don't care about being .equals at all.
- // as a matter of fact if you pass brokerURL in a way it's equals to
DEFAULT_BROKER_URL,
- // we should not the broker URL Instance
- // and still honor the one passed by parameter.
- // SupressWarnings was added to this method to supress the false
positive here from error-prone.
- if (brokerURL == DEFAULT_BROKER_URL) {
- String brokerURLInstance = getBrokerURLInstance(acceptor);
-
- if (brokerURLInstance != null) {
-brokerURL = brokerURLInstance;
- }
- }
-
- context.out.println("Connection brokerURL = " + brokerURL);
-
- return null;
- }
+public class BasicConnectionAbstrac
(activemq-cli-tools) branch main updated: fix a few doc things
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-cli-tools.git The following commit(s) were added to refs/heads/main by this push: new 1eab1e0 fix a few doc things 1eab1e0 is described below commit 1eab1e006c102d27fb5a430be1267c8a0a35b58f Author: Justin Bertram AuthorDate: Thu Apr 4 08:38:39 2024 -0500 fix a few doc things --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4f338a6..7492ea5 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,11 @@ Apache ActiveMQ Command Line Tools == -The ActiveMQ Command Line Tools project is home to several CLI based projects -useful for users of the ActiveMQ and ActiveMQ Artemis messaging brokers +The ActiveMQ Command Line Tools project is home to several CLI based projects useful for users of the ActiveMQ Classic and ActiveMQ Artemis messaging brokers ## ActiveMQ KahaDB Export Tool -This tool can be used to export a KahaDB or MultiKahaDB store to Artemis XML format. The resulting XML document can then be imported into an Artemis broker (version 2.0.0+) using the Artemis CLI tool. See [Artemis CLI tool](https://activemq.apache.org/artemis/docs/2.0.0/tools.html) +This tool can be used to export a KahaDB or MultiKahaDB store to Artemis' XML format. The resulting XML document can then be imported into an Artemis broker (version 2.0.0+) using the Artemis CLI tool. See [Artemis CLI tool](https://activemq.apache.org/components/artemis/documentation/latest/data-tools.html#data-tools) ### Usage ```
(activemq-artemis) branch main updated: ARTEMIS-4698 mitigate NPE when removing metrics
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new f36e944641 ARTEMIS-4698 mitigate NPE when removing metrics
f36e944641 is described below
commit f36e944641b8642c5acab55c2076871e86f59c70
Author: Justin Bertram
AuthorDate: Mon Mar 25 13:15:06 2024 -0500
ARTEMIS-4698 mitigate NPE when removing metrics
---
.../apache/activemq/artemis/core/server/metrics/MetricsManager.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/metrics/MetricsManager.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/metrics/MetricsManager.java
index bc688f99cc..da65d59068 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/metrics/MetricsManager.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/metrics/MetricsManager.java
@@ -168,7 +168,11 @@ public class MetricsManager {
logger.debug("Unregistering meters for {}", resource);
for (Meter meter : resourceMeters) {
Meter removed = meterRegistry.remove(meter);
-logger.debug("Unregistered meter: {}", removed.getId());
+if (removed != null) {
+ logger.debug("Unregistered meter: {}", removed.getId());
+} else {
+ logger.debug("Attempted to unregister meter {}, but it wasn't
found in the registry", meter);
+}
}
} else {
logger.debug("Attempted to unregister meters for {}, but none were
found.", resource);
svn commit: r68073 - /release/activemq/activemq-artemis/2.31.2/
Author: jbertram Date: Sat Mar 23 04:26:15 2024 New Revision: 68073 Log: clean out older release Removed: release/activemq/activemq-artemis/2.31.2/
svn commit: r68072 - /release/activemq/activemq-artemis/2.32.0/
Author: jbertram Date: Sat Mar 23 04:25:54 2024 New Revision: 68072 Log: clean out older release Removed: release/activemq/activemq-artemis/2.32.0/
(activemq-artemis-examples) branch main updated (6958316 -> c0338f6)
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis-examples.git from 6958316 Update examples to version 2.32.0 add 2ac3b9d Update examples to version 2.33.0-SNAPSHOT add a4643cb ARTEMIS-4601 remove OpenTelemetry deps from main pom (#4) add 8c5a154 tweak version update script sed usage to also work on MacOS add 564ac5e ARTEMIS-4608 upgrade Derby to 10.15.2.0 (#5) add 1bdab8a Update CONTRIBUTING.md to cover using the CI job for testing add 328ca27 ARTEMIS-4656: remove unused artemis-spring-integration module dep, add used artemis-server and artemis-jms-client deps add f2cffdc add note to CONTRIBUTING.md about Jiras and commit log references add 46e506e ARTEMIS-4658 AMQP federation example for multicast over hub and spoke add 27aa913 ARTEMIS-4683 Adds examples of AMQP federation configurations add c0338f6 Update examples to version 2.33.0 No new revisions were added by this update. Summary of changes: CONTRIBUTING.md| 21 +- artemis-distribution/pom.xml | 2 +- .../amqp-federation-multicast-fanout/pom.xml | 357 + .../amqp-federation-multicast-fanout/readme.md | 5 + .../jms/example/BrokerFederationExample.java | 84 + .../src/main/resources/activemq/source}/broker.xml | 16 +- .../main/resources/activemq/tier-1.1}/broker.xml | 26 +- .../main/resources/activemq/tier-1.2}/broker.xml | 26 +- .../main/resources/activemq/tier-2.1}/broker.xml | 26 +- .../main/resources/activemq/tier-2.2}/broker.xml | 26 +- .../main/resources/activemq/tier-2.3}/broker.xml | 26 +- .../main/resources/activemq/tier-2.4}/broker.xml | 26 +- .../amqp-federation-multicast-hub-spoke}/pom.xml | 112 +++ .../amqp-federation-multicast-hub-spoke/readme.md | 5 + .../jms/example/BrokerFederationExample.java | 231 + .../src/main/resources/activemq/hub}/broker.xml| 12 +- .../src/main/resources/activemq/spoke1}/broker.xml | 21 +- .../src/main/resources/activemq/spoke2}/broker.xml | 23 +- .../src/main/resources/activemq/spoke3}/broker.xml | 23 +- .../amqp-federation-multicast-ring}/pom.xml| 108 --- .../amqp-federation-multicast-ring/readme.md | 5 + .../jms/example/BrokerFederationExample.java | 227 + .../main/resources/activemq/server1}/broker.xml| 23 +- .../main/resources/activemq/server2}/broker.xml| 23 +- .../main/resources/activemq/server3}/broker.xml| 23 +- .../main/resources/activemq/server4}/broker.xml| 23 +- .../pom.xml| 34 +- .../readme.md | 5 + .../jms/example/BrokerFederationExample.java | 75 + .../main/resources/activemq/server1}/broker.xml| 21 +- .../main/resources/activemq/server2}/broker.xml| 14 +- .../pom.xml| 34 +- .../amqp-federation-queue-priority/readme.md | 5 + .../jms/example/BrokerFederationExample.java | 74 + .../src/main/resources/activemq/server1/broker.xml | 12 +- .../main/resources/activemq/server2}/broker.xml| 21 +- .../broker-connection/amqp-federation/pom.xml | 2 +- .../amqp-receiving-messages/pom.xml| 2 +- .../amqp-sending-messages-multicast/pom.xml| 2 +- .../amqp-sending-messages/pom.xml | 2 +- .../broker-connection/amqp-sending-overssl/pom.xml | 2 +- .../broker-connection/disaster-recovery/pom.xml| 2 +- examples/features/broker-connection/pom.xml| 12 +- .../clustered/client-side-load-balancing/pom.xml | 2 +- .../clustered-durable-subscription/pom.xml | 2 +- .../features/clustered/clustered-grouping/pom.xml | 2 +- .../features/clustered/clustered-jgroups/pom.xml | 2 +- .../features/clustered/clustered-queue/pom.xml | 2 +- .../clustered-static-discovery-uri/pom.xml | 2 +- .../clustered/clustered-static-discovery/pom.xml | 2 +- .../clustered/clustered-static-oneway/pom.xml | 2 +- .../features/clustered/clustered-topic-uri/pom.xml | 2 +- .../features/clustered/clustered-topic/pom.xml | 2 +- examples/features/clustered/pom.xml| 2 +- .../clustered/queue-message-redistribution/pom.xml | 2 +- .../shared-storage-static-cluster/pom.xml | 2 +- .../features/clustered/symmetric-cluster/pom.xml | 2 +- .../connection-router/evenly-redirect/pom.xml | 2 +- examples/features/connection-router/pom.xml| 2 +- .../connection-router/symmetric-redirect/pom.xml | 2 +- .../connection-router/symmetric-simple/pom.xml | 2 +- .../federation/federated-address-divert/pom.xml| 2 +- .../federated-address-downstream-upstream/pom.xml
(activemq-artemis-examples) branch development updated (27aa913 -> cf62334)
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a change to branch development in repository https://gitbox.apache.org/repos/asf/activemq-artemis-examples.git from 27aa913 ARTEMIS-4683 Adds examples of AMQP federation configurations new c0338f6 Update examples to version 2.33.0 new cf62334 Update examples to version 2.34.0-SNAPSHOT The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: artemis-distribution/pom.xml | 2 +- .../broker-connection/amqp-federation-multicast-fanout/pom.xml| 2 +- .../broker-connection/amqp-federation-multicast-hub-spoke/pom.xml | 2 +- .../features/broker-connection/amqp-federation-multicast-ring/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-dual-federation/pom.xml | 2 +- .../features/broker-connection/amqp-federation-queue-priority/pom.xml | 2 +- examples/features/broker-connection/amqp-federation/pom.xml | 2 +- examples/features/broker-connection/amqp-receiving-messages/pom.xml | 2 +- .../broker-connection/amqp-sending-messages-multicast/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-overssl/pom.xml | 2 +- examples/features/broker-connection/disaster-recovery/pom.xml | 2 +- examples/features/broker-connection/pom.xml | 2 +- examples/features/clustered/client-side-load-balancing/pom.xml| 2 +- examples/features/clustered/clustered-durable-subscription/pom.xml| 2 +- examples/features/clustered/clustered-grouping/pom.xml| 2 +- examples/features/clustered/clustered-jgroups/pom.xml | 2 +- examples/features/clustered/clustered-queue/pom.xml | 2 +- examples/features/clustered/clustered-static-discovery-uri/pom.xml| 2 +- examples/features/clustered/clustered-static-discovery/pom.xml| 2 +- examples/features/clustered/clustered-static-oneway/pom.xml | 2 +- examples/features/clustered/clustered-topic-uri/pom.xml | 2 +- examples/features/clustered/clustered-topic/pom.xml | 2 +- examples/features/clustered/pom.xml | 2 +- examples/features/clustered/queue-message-redistribution/pom.xml | 2 +- examples/features/clustered/shared-storage-static-cluster/pom.xml | 2 +- examples/features/clustered/symmetric-cluster/pom.xml | 2 +- examples/features/connection-router/evenly-redirect/pom.xml | 2 +- examples/features/connection-router/pom.xml | 2 +- examples/features/connection-router/symmetric-redirect/pom.xml| 2 +- examples/features/connection-router/symmetric-simple/pom.xml | 2 +- examples/features/federation/federated-address-divert/pom.xml | 2 +- .../features/federation/federated-address-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-address-downstream/pom.xml | 2 +- examples/features/federation/federated-address/pom.xml| 2 +- .../features/federation/federated-queue-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-queue-downstream/pom.xml | 2 +- examples/features/federation/federated-queue/pom.xml | 2 +- examples/features/federation/pom.xml | 2 +- examples/features/ha/application-layer-failover/pom.xml | 2 +- examples/features/ha/client-side-failoverlistener/pom.xml | 2 +- examples/features/ha/colocated-failover-scale-down/pom.xml| 2 +- examples/features/ha/colocated-failover/pom.xml | 2 +- examples/features/ha/ha-policy-autobackup/pom.xml | 2 +- examples/features/ha/multiple-failover-failback/pom.xml | 2 +- examples/features/ha/multiple-failover/pom.xml| 2 +- examples/features/ha/non-transaction-failover/pom.xml | 2 +- examples/features/ha/pom.xml | 2 +- examples/features/ha/replicated-failback-static/pom.xml | 2 +- examples/features/ha/replicated-failback/pom.xml | 2 +- examples/features/ha/replicated-multiple-failover/pom.xml | 2 +- examples/features/ha/replicated-transaction-failover/pom.xml | 2 +- examples/features/ha/scale-down/pom.xml | 2 +- examples/features/ha/stop-server-failover/pom.xml | 2 +- examples/features/ha/transaction-failover/pom.xml | 2 +- examples/features/ha/zookeeper-single-p
(activemq-artemis-examples) 01/02: Update examples to version 2.33.0
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch development in repository https://gitbox.apache.org/repos/asf/activemq-artemis-examples.git commit c0338f6fd35b5bcbed1b3b58077645f8e8bd2d1d Author: Justin Bertram AuthorDate: Fri Mar 22 23:09:53 2024 -0500 Update examples to version 2.33.0 --- artemis-distribution/pom.xml | 2 +- .../broker-connection/amqp-federation-multicast-fanout/pom.xml| 2 +- .../broker-connection/amqp-federation-multicast-hub-spoke/pom.xml | 2 +- .../features/broker-connection/amqp-federation-multicast-ring/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-dual-federation/pom.xml | 2 +- .../features/broker-connection/amqp-federation-queue-priority/pom.xml | 2 +- examples/features/broker-connection/amqp-federation/pom.xml | 2 +- examples/features/broker-connection/amqp-receiving-messages/pom.xml | 2 +- .../broker-connection/amqp-sending-messages-multicast/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-overssl/pom.xml | 2 +- examples/features/broker-connection/disaster-recovery/pom.xml | 2 +- examples/features/broker-connection/pom.xml | 2 +- examples/features/clustered/client-side-load-balancing/pom.xml| 2 +- examples/features/clustered/clustered-durable-subscription/pom.xml| 2 +- examples/features/clustered/clustered-grouping/pom.xml| 2 +- examples/features/clustered/clustered-jgroups/pom.xml | 2 +- examples/features/clustered/clustered-queue/pom.xml | 2 +- examples/features/clustered/clustered-static-discovery-uri/pom.xml| 2 +- examples/features/clustered/clustered-static-discovery/pom.xml| 2 +- examples/features/clustered/clustered-static-oneway/pom.xml | 2 +- examples/features/clustered/clustered-topic-uri/pom.xml | 2 +- examples/features/clustered/clustered-topic/pom.xml | 2 +- examples/features/clustered/pom.xml | 2 +- examples/features/clustered/queue-message-redistribution/pom.xml | 2 +- examples/features/clustered/shared-storage-static-cluster/pom.xml | 2 +- examples/features/clustered/symmetric-cluster/pom.xml | 2 +- examples/features/connection-router/evenly-redirect/pom.xml | 2 +- examples/features/connection-router/pom.xml | 2 +- examples/features/connection-router/symmetric-redirect/pom.xml| 2 +- examples/features/connection-router/symmetric-simple/pom.xml | 2 +- examples/features/federation/federated-address-divert/pom.xml | 2 +- .../features/federation/federated-address-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-address-downstream/pom.xml | 2 +- examples/features/federation/federated-address/pom.xml| 2 +- .../features/federation/federated-queue-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-queue-downstream/pom.xml | 2 +- examples/features/federation/federated-queue/pom.xml | 2 +- examples/features/federation/pom.xml | 2 +- examples/features/ha/application-layer-failover/pom.xml | 2 +- examples/features/ha/client-side-failoverlistener/pom.xml | 2 +- examples/features/ha/colocated-failover-scale-down/pom.xml| 2 +- examples/features/ha/colocated-failover/pom.xml | 2 +- examples/features/ha/ha-policy-autobackup/pom.xml | 2 +- examples/features/ha/multiple-failover-failback/pom.xml | 2 +- examples/features/ha/multiple-failover/pom.xml| 2 +- examples/features/ha/non-transaction-failover/pom.xml | 2 +- examples/features/ha/pom.xml | 2 +- examples/features/ha/replicated-failback-static/pom.xml | 2 +- examples/features/ha/replicated-failback/pom.xml | 2 +- examples/features/ha/replicated-multiple-failover/pom.xml | 2 +- examples/features/ha/replicated-transaction-failover/pom.xml | 2 +- examples/features/ha/scale-down/pom.xml | 2 +- examples/features/ha/stop-server-failover/pom.xml | 2 +- examples/features/ha/transaction-failover/pom.xml | 2 +- examples/features/ha/zookeeper-single-pair-failback/pom.xml | 2 +- examples/features/perf/perf/pom.xml | 2 +- examples/features/perf/pom.xml| 2 +- examples/features/perf/soak/pom.xml | 2 +- examples/features/pom.xml
(activemq-artemis-examples) 02/02: Update examples to version 2.34.0-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch development in repository https://gitbox.apache.org/repos/asf/activemq-artemis-examples.git commit cf623344eb6e9899840adffc3a3b0b7c4496fc60 Author: Justin Bertram AuthorDate: Fri Mar 22 23:10:03 2024 -0500 Update examples to version 2.34.0-SNAPSHOT --- artemis-distribution/pom.xml | 2 +- .../broker-connection/amqp-federation-multicast-fanout/pom.xml| 2 +- .../broker-connection/amqp-federation-multicast-hub-spoke/pom.xml | 2 +- .../features/broker-connection/amqp-federation-multicast-ring/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-dual-federation/pom.xml | 2 +- .../features/broker-connection/amqp-federation-queue-priority/pom.xml | 2 +- examples/features/broker-connection/amqp-federation/pom.xml | 2 +- examples/features/broker-connection/amqp-receiving-messages/pom.xml | 2 +- .../broker-connection/amqp-sending-messages-multicast/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-overssl/pom.xml | 2 +- examples/features/broker-connection/disaster-recovery/pom.xml | 2 +- examples/features/broker-connection/pom.xml | 2 +- examples/features/clustered/client-side-load-balancing/pom.xml| 2 +- examples/features/clustered/clustered-durable-subscription/pom.xml| 2 +- examples/features/clustered/clustered-grouping/pom.xml| 2 +- examples/features/clustered/clustered-jgroups/pom.xml | 2 +- examples/features/clustered/clustered-queue/pom.xml | 2 +- examples/features/clustered/clustered-static-discovery-uri/pom.xml| 2 +- examples/features/clustered/clustered-static-discovery/pom.xml| 2 +- examples/features/clustered/clustered-static-oneway/pom.xml | 2 +- examples/features/clustered/clustered-topic-uri/pom.xml | 2 +- examples/features/clustered/clustered-topic/pom.xml | 2 +- examples/features/clustered/pom.xml | 2 +- examples/features/clustered/queue-message-redistribution/pom.xml | 2 +- examples/features/clustered/shared-storage-static-cluster/pom.xml | 2 +- examples/features/clustered/symmetric-cluster/pom.xml | 2 +- examples/features/connection-router/evenly-redirect/pom.xml | 2 +- examples/features/connection-router/pom.xml | 2 +- examples/features/connection-router/symmetric-redirect/pom.xml| 2 +- examples/features/connection-router/symmetric-simple/pom.xml | 2 +- examples/features/federation/federated-address-divert/pom.xml | 2 +- .../features/federation/federated-address-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-address-downstream/pom.xml | 2 +- examples/features/federation/federated-address/pom.xml| 2 +- .../features/federation/federated-queue-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-queue-downstream/pom.xml | 2 +- examples/features/federation/federated-queue/pom.xml | 2 +- examples/features/federation/pom.xml | 2 +- examples/features/ha/application-layer-failover/pom.xml | 2 +- examples/features/ha/client-side-failoverlistener/pom.xml | 2 +- examples/features/ha/colocated-failover-scale-down/pom.xml| 2 +- examples/features/ha/colocated-failover/pom.xml | 2 +- examples/features/ha/ha-policy-autobackup/pom.xml | 2 +- examples/features/ha/multiple-failover-failback/pom.xml | 2 +- examples/features/ha/multiple-failover/pom.xml| 2 +- examples/features/ha/non-transaction-failover/pom.xml | 2 +- examples/features/ha/pom.xml | 2 +- examples/features/ha/replicated-failback-static/pom.xml | 2 +- examples/features/ha/replicated-failback/pom.xml | 2 +- examples/features/ha/replicated-multiple-failover/pom.xml | 2 +- examples/features/ha/replicated-transaction-failover/pom.xml | 2 +- examples/features/ha/scale-down/pom.xml | 2 +- examples/features/ha/stop-server-failover/pom.xml | 2 +- examples/features/ha/transaction-failover/pom.xml | 2 +- examples/features/ha/zookeeper-single-pair-failback/pom.xml | 2 +- examples/features/perf/perf/pom.xml | 2 +- examples/features/perf/pom.xml| 2 +- examples/features/perf/soak/pom.xml | 2 +- examples/features/pom.xml
svn commit: r68071 - /release/activemq/activemq-artemis/2.33.0/
Author: jbertram Date: Sat Mar 23 03:25:20 2024 New Revision: 68071 Log: add files for activemq-artemis-2.33.0 Added: release/activemq/activemq-artemis/2.33.0/ - copied from r68070, dev/activemq/activemq-artemis/2.33.0/
(activemq-website) branch main updated: Fix commit report for 2.33.0
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new df50ed3e0 Fix commit report for 2.33.0 df50ed3e0 is described below commit df50ed3e066cdc11c0fad577985959ba3bfaf303 Author: Justin Bertram AuthorDate: Tue Mar 19 18:01:32 2024 -0500 Fix commit report for 2.33.0 --- .../artemis/download/commit-report-2.33.0.html | 4 +- .../artemis/download/styles/framework.css | 14 -- .../download/styles/jquery.dataTables.min.css | 1 - .../download/styles/jquery.dataTables.min.js | 192 - .../artemis/download/styles/jquery.min.js | 2 - 5 files changed, 2 insertions(+), 211 deletions(-) diff --git a/src/components/artemis/download/commit-report-2.33.0.html b/src/components/artemis/download/commit-report-2.33.0.html index ccbde48c3..4618f8d1d 100644 --- a/src/components/artemis/download/commit-report-2.33.0.html +++ b/src/components/artemis/download/commit-report-2.33.0.html @@ -1,7 +1,7 @@ - - + +
svn commit: r68014 - /dev/activemq/activemq-artemis/2.33.0/
Author: jbertram Date: Tue Mar 19 21:24:02 2024 New Revision: 68014 Log: 2.33.0 Added: dev/activemq/activemq-artemis/2.33.0/ dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.tar.gz (with props) dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.tar.gz.asc dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.tar.gz.sha512 dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.zip (with props) dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.zip.asc dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.zip.sha512 dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-source-release.tar.gz (with props) dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-source-release.tar.gz.asc dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-source-release.tar.gz.sha512 dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-source-release.zip (with props) dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-source-release.zip.asc dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-source-release.zip.sha512 Added: dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.tar.gz == Binary file - no diff available. Propchange: dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.tar.gz.asc == --- dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.tar.gz.asc (added) +++ dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.tar.gz.asc Tue Mar 19 21:24:02 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEPbjMvM8H7jaPfEjW9BgwuHW7hjMFAmX6ACAACgkQ9BgwuHW7 +hjMqtA/9F2PYSAqi+xbx14EdtyrcGA99bPE8bpK5Ip+I0y57z3hLmO25/759MWxR +Uxg45SyS6+HpVvQBtUrIRtltiMSmO0WzSk4L4jkqfWqr00lkx/q1LQ6xBb17ZnyL +GVz+jgG2bo22Y1jiH5Cf90pNInzyWImHqKXRZnjamtRJT1HxNvQ6S5nYSYu/f5LV +Ex/ppUuabpDwghjau5V8Rgxt5+xW4THAtv63s5pR8vXGXeyhwYdsXSQUnhvCNVTX +ENJ0bs5nKBr714SAK1fY8T20zeEl1u8k9McclCaSdaM65pPo4DH+Zhuy1oNw74/z +R+8qML2a41KRKubQR6nBWk+dNXRrGNtY5PheQrlJVgKIzQjVhJTNuePqffccabVD +1XhBVuDoWSDRKWARSCt/QpVRTiZQbiHZlkNBNBYWOq0Jv2O8cZRzdhYPrxg+MBsH +BO+XsShdFY2kvTAWdZGjgP+d2ONIPHqXuc5tkTjTlSBEf+K6Ca2KPu60c+OWX13m +rnuccLUs6rgLRL34ojETSfyLRjUyAWsz5vX/ynEvNrj5HYTIfyjtgnTXtfGNOmSA +HKt55/ImSui+DZXc7r56orJcYF3o99T3/g7q23z4IKkgEFeUOPbGMiZnn6epyzyK +VmABEAHNNt4l8niPZ88qv6tmYx2PVZhfWNTW7p24Nwd2ejxi8a4= +=1/EY +-END PGP SIGNATURE- Added: dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.tar.gz.sha512 == --- dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.tar.gz.sha512 (added) +++ dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.tar.gz.sha512 Tue Mar 19 21:24:02 2024 @@ -0,0 +1 @@ +984df20fb1bc2d9254fbf9694411f3297937064d2de3d76c987baffa855d115e23406a97023262d93b2ef4a218f839f7eeffc493fa904a7c566d48ddcc0e5d86 apache-artemis-2.33.0-bin.tar.gz Added: dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.zip == Binary file - no diff available. Propchange: dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.zip.asc == --- dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.zip.asc (added) +++ dev/activemq/activemq-artemis/2.33.0/apache-artemis-2.33.0-bin.zip.asc Tue Mar 19 21:24:02 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEPbjMvM8H7jaPfEjW9BgwuHW7hjMFAmX6AB8ACgkQ9BgwuHW7 +hjNd/hAAsH3TTmB1vCK8hj3x2LY42xdgm+TF9hmnIjcEtyODbfvWhStJTEYVCD4w +nm4/4NuHO+mdLdImh6ByvDC3n5nGRtVxoeoyrBT2g0iESoTwUxXcH2gZjJ0JygK4 +FyW7HQ5H430Bv+hOBAxfsFDzP74MJvz1Sqbv/vICnRCtSjdEH5k8ViDN0q+zuwXN +BpL/I+t3aLwWbXhGsjyxh7VGpaf5x6hsdE1rSPA9tV5Y8ozYMvQrUTGtC1FONPFR +9h+7jFQfL6hmzrHYIZUlSJh+uZNUrzMuuDFT+bmOZtYe59lSa6kOj8sFfr7L1wGZ +UTCyOa0hGxtcL3+FE26j5AhCxtjcTZhjPwVe508RG2xY8sWI9Thse+TsA2BO+Mi8 +IlqR6HQNK5ZWSLD7/skgFMVqpVI8CIuH/cfdGzIoPjB0wOpSu6Q25VdnZRb1AWBa +pQ/NQQ0xoZ8mr4JaPlxUp/oPa+xBU354OpMT/dbnTnizcUZ1UKbbpIIx3ef6D/xD +Ehd4jPDOCBWas1RDetXxWb55b3kyGKZe6++QBsnjeltdOMcHbVVtMrBkGAosCNFw +dSGRHqCw9uGbK4Ul5wgFAAOPWBPHywqR1erDWBiPfDd+MeypsepFSRmQYNWPMqdu +ukoy7FQfYwXIsKd2MTeNFCff6+aWZ0Xw1P7o3Id51FWbujwtKX4= +=UMya +-END PGP SIGNATURE- Added: dev/activemq/activemq-artemis/2.33.0/apache
(activemq-artemis) branch main updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 2cc3704551 [maven-release-plugin] prepare for next development iteration 2cc3704551 is described below commit 2cc3704551d76acbca31a486df250ea206797deb Author: Justin Bertram AuthorDate: Tue Mar 19 15:22:47 2024 -0500 [maven-release-plugin] prepare for next development iteration --- artemis-bom/pom.xml | 2 +- artemis-boot/pom.xml| 2 +- artemis-cdi-client/pom.xml | 2 +- artemis-cli/pom.xml | 2 +- artemis-commons/pom.xml | 2 +- artemis-core-client-all/pom.xml | 2 +- artemis-core-client-osgi/pom.xml| 2 +- artemis-core-client/pom.xml | 2 +- artemis-distribution/pom.xml| 2 +- artemis-dto/pom.xml | 2 +- artemis-features/pom.xml| 2 +- artemis-hawtio/activemq-branding/pom.xml| 2 +- artemis-hawtio/artemis-console/pom.xml | 2 +- artemis-hawtio/artemis-plugin/pom.xml | 2 +- artemis-hawtio/pom.xml | 2 +- artemis-image/examples/pom.xml | 2 +- artemis-image/pom.xml | 2 +- artemis-jakarta-client-all/pom.xml | 2 +- artemis-jakarta-client/pom.xml | 2 +- artemis-jakarta-ra/pom.xml | 2 +- artemis-jakarta-server/pom.xml | 2 +- artemis-jakarta-service-extensions/pom.xml | 2 +- artemis-jdbc-store/pom.xml | 2 +- artemis-jms-client-all/pom.xml | 2 +- artemis-jms-client-osgi/pom.xml | 2 +- artemis-jms-client/pom.xml | 2 +- artemis-jms-server/pom.xml | 2 +- artemis-journal/pom.xml | 2 +- artemis-junit/artemis-junit-4/pom.xml | 2 +- artemis-junit/artemis-junit-5/pom.xml | 2 +- artemis-junit/artemis-junit-commons/pom.xml | 2 +- artemis-junit/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-api/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-ri/pom.xml | 2 +- artemis-lockmanager/pom.xml | 2 +- artemis-log-annotation-processor/pom.xml| 2 +- artemis-maven-plugin/pom.xml| 2 +- artemis-pom/pom.xml | 2 +- artemis-protocols/artemis-amqp-protocol/pom.xml | 2 +- artemis-protocols/artemis-hornetq-protocol/pom.xml | 2 +- artemis-protocols/artemis-hqclient-protocol/pom.xml | 2 +- artemis-protocols/artemis-jakarta-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-mqtt-protocol/pom.xml | 2 +- artemis-protocols/artemis-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-stomp-protocol/pom.xml| 2 +- artemis-protocols/pom.xml | 2 +- artemis-ra/pom.xml | 2 +- artemis-selector/pom.xml| 2 +- artemis-server-osgi/pom.xml | 2 +- artemis-server/pom.xml | 2 +- artemis-service-extensions/pom.xml | 2 +- artemis-unit-test-support/pom.xml | 2 +- artemis-web/pom.xml | 2 +- artemis-website/pom.xml | 2 +- pom.xml | 6 +++--- tests/activemq5-unit-tests/pom.xml | 2 +- tests/artemis-test-support/pom.xml | 2 +- tests/compatibility-tests/pom.xml | 2 +- tests/db-tests/pom.xml | 2 +- tests/e2e-tests/pom.xml | 2 +- tests/integration-tests-isolated/pom.xml| 2 +- tests/integration-tests/pom.xml | 2 +- tests/jms-tests/pom.xml | 2 +- tests/joram-tests/pom.xml | 2 +- tests/karaf-client-integration-tests/pom.xml| 2 +- tests/karaf-server
(activemq-artemis) annotated tag 2.33.0 created (now e4cb7e7cd0)
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a change to annotated tag 2.33.0 in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git at e4cb7e7cd0 (tag) tagging 900d217bf96353264560f48249c9d5ebd7d901ea (commit) replaces 2.32.0 by Justin Bertram on Tue Mar 19 15:22:35 2024 -0500 - Log - [maven-release-plugin] copy for tag 2.33.0 --- No new revisions were added by this update.
(activemq-artemis) branch main updated: [maven-release-plugin] prepare release 2.33.0
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 900d217bf9 [maven-release-plugin] prepare release 2.33.0 900d217bf9 is described below commit 900d217bf96353264560f48249c9d5ebd7d901ea Author: Justin Bertram AuthorDate: Tue Mar 19 15:21:32 2024 -0500 [maven-release-plugin] prepare release 2.33.0 --- artemis-bom/pom.xml | 2 +- artemis-boot/pom.xml| 2 +- artemis-cdi-client/pom.xml | 2 +- artemis-cli/pom.xml | 2 +- artemis-commons/pom.xml | 2 +- artemis-core-client-all/pom.xml | 2 +- artemis-core-client-osgi/pom.xml| 2 +- artemis-core-client/pom.xml | 2 +- artemis-distribution/pom.xml| 2 +- artemis-dto/pom.xml | 2 +- artemis-features/pom.xml| 2 +- artemis-hawtio/activemq-branding/pom.xml| 2 +- artemis-hawtio/artemis-console/pom.xml | 6 +++--- artemis-hawtio/artemis-plugin/pom.xml | 2 +- artemis-hawtio/pom.xml | 2 +- artemis-image/examples/pom.xml | 2 +- artemis-image/pom.xml | 2 +- artemis-jakarta-client-all/pom.xml | 2 +- artemis-jakarta-client/pom.xml | 2 +- artemis-jakarta-ra/pom.xml | 2 +- artemis-jakarta-server/pom.xml | 2 +- artemis-jakarta-service-extensions/pom.xml | 2 +- artemis-jdbc-store/pom.xml | 2 +- artemis-jms-client-all/pom.xml | 2 +- artemis-jms-client-osgi/pom.xml | 2 +- artemis-jms-client/pom.xml | 2 +- artemis-jms-server/pom.xml | 2 +- artemis-journal/pom.xml | 2 +- artemis-junit/artemis-junit-4/pom.xml | 2 +- artemis-junit/artemis-junit-5/pom.xml | 2 +- artemis-junit/artemis-junit-commons/pom.xml | 2 +- artemis-junit/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-api/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-ri/pom.xml | 2 +- artemis-lockmanager/pom.xml | 2 +- artemis-log-annotation-processor/pom.xml| 2 +- artemis-maven-plugin/pom.xml| 2 +- artemis-pom/pom.xml | 2 +- artemis-protocols/artemis-amqp-protocol/pom.xml | 2 +- artemis-protocols/artemis-hornetq-protocol/pom.xml | 2 +- artemis-protocols/artemis-hqclient-protocol/pom.xml | 2 +- artemis-protocols/artemis-jakarta-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-mqtt-protocol/pom.xml | 2 +- artemis-protocols/artemis-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-stomp-protocol/pom.xml| 2 +- artemis-protocols/pom.xml | 2 +- artemis-ra/pom.xml | 2 +- artemis-selector/pom.xml| 2 +- artemis-server-osgi/pom.xml | 2 +- artemis-server/pom.xml | 2 +- artemis-service-extensions/pom.xml | 2 +- artemis-unit-test-support/pom.xml | 2 +- artemis-web/pom.xml | 2 +- artemis-website/pom.xml | 2 +- pom.xml | 6 +++--- tests/activemq5-unit-tests/pom.xml | 2 +- tests/artemis-test-support/pom.xml | 2 +- tests/compatibility-tests/pom.xml | 2 +- tests/db-tests/pom.xml | 2 +- tests/e2e-tests/pom.xml | 2 +- tests/integration-tests-isolated/pom.xml| 2 +- tests/integration-tests/pom.xml | 2 +- tests/jms-tests/pom.xml | 2 +- tests/joram-tests/pom.xml | 2 +- tests/karaf-client-integration-tests/pom.xml| 2 +- tests/karaf-server-integration-tests/pom.xml
(activemq-artemis) branch main updated: NO-JIRA update versions doc for impending release
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 697cebd7dc NO-JIRA update versions doc for impending release 697cebd7dc is described below commit 697cebd7dc7c2eab2c127d82b2aba4ba8d34eaaa Author: Justin Bertram AuthorDate: Tue Mar 19 15:01:07 2024 -0500 NO-JIRA update versions doc for impending release --- docs/user-manual/versions.adoc | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/user-manual/versions.adoc b/docs/user-manual/versions.adoc index 4cf96ddb6a..b506045ed8 100644 --- a/docs/user-manual/versions.adoc +++ b/docs/user-manual/versions.adoc @@ -14,12 +14,20 @@ NOTE: Follow the general upgrade procedure outlined in the xref:upgrading.adoc#u == 2.33.0 -https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315920=...[Full release notes] +https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315920=12354184[Full release notes] === Highlights -* highlight 1 -* highlight 2 +* Support for JSON formatted typed properties on CLI `producer` command +* New CLI command `pwd` for showing directories related to the current instance +* Maven Bill of Materials (BOM) `artemis-bom` to simplify integration +* "FirstMessage" API for scheduled messages +* New xref:security.adoc#role-based-security-for-addresses["view" and "edit"] permissions for management operations configurable via `security-settings` in `broker.xml` +* New `sslAutoReload` parameter for the embedded web server configured in `bootstrap.xml` to detect and automatically reload whe SSL stores change on disk +* Performance improvements on mirroring and paging +* xref:metrics#optional-metrics[Logging metrics] to mitigate the risk of missing `WARN` or `ERROR` messages in the log. +* Much improved documentation on xref:network-isolation.adoc[network isolation (aka split brain)] +* xref:network-isolation.adoc#pluggable-lock-manager[Pluggable lock manager] (aka pluggable quorum voting) out of "experimental" status and ready for general use === Upgrading from 2.32.0
(activemq-artemis) branch main updated: NO-JIRA fix relase doc formatting
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 6a4fb5763f NO-JIRA fix relase doc formatting 6a4fb5763f is described below commit 6a4fb5763fd2191fec31a6a601f725834975869e Author: Justin Bertram AuthorDate: Tue Mar 19 14:01:27 2024 -0500 NO-JIRA fix relase doc formatting --- RELEASING.md | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index 9682e05370..125cdd3ae2 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -6,12 +6,12 @@ Things to do before issuing a new release: entries for guidance. * Build the release locally: mvn clean install -Prelease -1. Check the manuals have been created properly -2. Check the javadocs are created correctly (including the diagrams) + 1. Check the manuals have been created properly + 2. Check the javadocs are created correctly (including the diagrams) * Test the standalone release (this should be done on windows as well as linux): -1. Unpack the distribution zip or tar.gz -2. Start and stop the server + 1. Unpack the distribution zip or tar.gz + 2. Start and stop the server * Run the examples, from the [development branch](https://github.com/apache/activemq-artemis-examples/tree/development).
(activemq-artemis) 04/04: This closes #4835
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git commit 9757c52d43fda692d5b581b22f05fa089f0dfa92 Merge: 2214724565 bc86a0a481 Author: Justin Bertram AuthorDate: Tue Mar 19 13:58:03 2024 -0500 This closes #4835 .../apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java | 1 - .../artemis/core/protocol/stomp/VersionedStompFrameHandler.java | 2 +- .../artemis/core/server/impl/jdbc/ActiveMQScheduledLeaseLock.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-)
(activemq-artemis) 02/04: ARTEMIS-4695 DLS_DEAD_LOCAL_STORE in AMQPLargeMessage.java
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit fc13a39c6fd130656396d433cbacdc4b0994101d
Author: aslepykh <145323274+aslep...@users.noreply.github.com>
AuthorDate: Thu Feb 29 09:51:53 2024 +0300
ARTEMIS-4695 DLS_DEAD_LOCAL_STORE in AMQPLargeMessage.java
The local variable constructorPos is initialized with the value of
buffer.position() in line 330, but the variable itself is not used
anywhere else, which may indicate an error.
---
.../apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java | 1 -
1 file changed, 1 deletion(-)
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
index d3ebbab4fd..d790505000 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
@@ -322,7 +322,6 @@ public class AMQPLargeMessage extends AMQPMessage
implements LargeServerMessage
decoder.setBuffer(buffer);
try {
- int constructorPos = buffer.position();
TypeConstructor constructor = decoder.readConstructor();
if (Header.class.equals(constructor.getTypeClass())) {
header = (Header) constructor.readValue();
(activemq-artemis) 01/04: ARTEMIS-4695 BAD_COPY_PASTE in VersionedStompFrameHandler.java
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 97a9c690ae238e805e34158e85fa9aaa0920650a
Author: aslepykh <145323274+aslep...@users.noreply.github.com>
AuthorDate: Thu Feb 29 09:42:37 2024 +0300
ARTEMIS-4695 BAD_COPY_PASTE in VersionedStompFrameHandler.java
In 1st branch (line 274) of the if() statement, the
Boolean.parseBoolean() method accepts the value
frame.getHeader(Stomp.Headers.Subscribe.NO_LOCAL), which is used in line
273.
In 2nd branch (line 276), the Boolean.parseBoolean() method accepts the
value frame.getHeader(Stomp.Headers.Subscribe.NO_LOCAL), although the
other value frame.hasHeader(Stomp.Headers.Subscribe.ACTIVEMQ_NO_LOCAL)
is used.
Found by Linux Verification Center (portal.linuxtesting.ru) with SVACE.
Author A. Slepykh.
---
.../artemis/core/protocol/stomp/VersionedStompFrameHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java
index bfad0794e4..b4cd5ead7b 100644
---
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java
+++
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java
@@ -273,7 +273,7 @@ public abstract class VersionedStompFrameHandler {
if (frame.hasHeader(Stomp.Headers.Subscribe.NO_LOCAL)) {
noLocal =
Boolean.parseBoolean(frame.getHeader(Stomp.Headers.Subscribe.NO_LOCAL));
} else if (frame.hasHeader(Stomp.Headers.Subscribe.ACTIVEMQ_NO_LOCAL)) {
- noLocal =
Boolean.parseBoolean(frame.getHeader(Stomp.Headers.Subscribe.NO_LOCAL));
+ noLocal =
Boolean.parseBoolean(frame.getHeader(Stomp.Headers.Subscribe.ACTIVEMQ_NO_LOCAL));
}
Integer consumerWindowSize = null;
if (frame.hasHeader(Headers.Subscribe.CONSUMER_WINDOW_SIZE)) {
(activemq-artemis) branch main updated (2214724565 -> 9757c52d43)
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git from 2214724565 ARTEMIS-4689 Adjusting XMLDataImporter to use BasicConnectionAbstract new 97a9c690ae ARTEMIS-4695 BAD_COPY_PASTE in VersionedStompFrameHandler.java new fc13a39c6f ARTEMIS-4695 DLS_DEAD_LOCAL_STORE in AMQPLargeMessage.java new bc86a0a481 ARTEMIS-4695 BAD_COPY_PASTE in ActiveMQScheduledLeaseLock.java new 9757c52d43 This closes #4835 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java | 1 - .../artemis/core/protocol/stomp/VersionedStompFrameHandler.java | 2 +- .../artemis/core/server/impl/jdbc/ActiveMQScheduledLeaseLock.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-)
(activemq-artemis) 03/04: ARTEMIS-4695 BAD_COPY_PASTE in ActiveMQScheduledLeaseLock.java
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit bc86a0a481879542525cb18243d23f51e3ae833d
Author: aslepykh <145323274+aslep...@users.noreply.github.com>
AuthorDate: Thu Feb 29 10:00:54 2024 +0300
ARTEMIS-4695 BAD_COPY_PASTE in ActiveMQScheduledLeaseLock.java
In the detectAndReportRenewSlowness() method, the logger.error() and
logger.warn() methods are called 3 times.
In two of the three calls, the method arguments correspond to parameters
that are tested in the if() conditional construct.
Also, the arguments of the logger.error() and logger.warn() methods are
identical in lines 139 and 141, respectively, which may indicate that
they were copied incorrectly.
---
.../artemis/core/server/impl/jdbc/ActiveMQScheduledLeaseLock.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/jdbc/ActiveMQScheduledLeaseLock.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/jdbc/ActiveMQScheduledLeaseLock.java
index a4d8b81262..523df09943 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/jdbc/ActiveMQScheduledLeaseLock.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/jdbc/ActiveMQScheduledLeaseLock.java
@@ -136,7 +136,7 @@ final class ActiveMQScheduledLeaseLock extends
ActiveMQScheduledComponent implem
final long measuredRenewPeriodNanos = renewStart - lastRenewStart;
final long measuredRenewPeriodMillis =
TimeUnit.NANOSECONDS.toMillis(measuredRenewPeriodNanos);
if (measuredRenewPeriodMillis - expirationMillis > 100) {
- logger.error("{} lock {} renew period lasted {} ms instead of {} ms",
lockName, lostLock ? "failed" : "successful", measuredRenewPeriodMillis,
expectedRenewPeriodMillis);
+ logger.error("{} lock {} renew period lasted {} ms instead of {} ms",
lockName, lostLock ? "failed" : "successful", measuredRenewPeriodMillis,
expirationMillis);
} else if (measuredRenewPeriodMillis - expectedRenewPeriodMillis > 100) {
logger.warn("{} lock {} renew period lasted {} ms instead of {} ms",
lockName, lostLock ? "failed" : "successful", measuredRenewPeriodMillis,
expectedRenewPeriodMillis);
}
(activemq-artemis) branch main updated: ARTEMIS-4691 log.warn on inVM closing
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 499a4eab6b ARTEMIS-4691 log.warn on inVM closing
499a4eab6b is described below
commit 499a4eab6bf3134f2f8660f428f089eeb4001484
Author: Clebert Suconic
AuthorDate: Mon Mar 18 10:32:29 2024 -0400
ARTEMIS-4691 log.warn on inVM closing
---
.../protocol/core/impl/RemotingConnectionImpl.java | 21 +---
.../artemis/logs/AssertionLoggerHandler.java | 8 +++
.../artemis/tests/integration/InVMCloseTest.java | 63 ++
3 files changed, 85 insertions(+), 7 deletions(-)
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
index 0a9f5a486a..45a009dc6c 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
@@ -205,24 +205,31 @@ public class RemotingConnectionImpl extends
AbstractRemotingConnection implement
ActiveMQClientLogger.LOGGER.connectionClosureDetected(transportConnection.getRemoteAddress(),
me.getMessage(), me.getType());
}
+ // Then call the listeners
+ callFailureListeners(me, scaleDownTargetNodeID);
+
+ close();
+
+ for (Channel channel : channels.values()) {
+ channel.returnBlocking(me);
+ }
+ }
+
+
+ @Override
+ public void close() {
try {
transportConnection.forceClose();
} catch (Throwable e) {
ActiveMQClientLogger.LOGGER.failedForceClose(e);
}
- // Then call the listeners
- callFailureListeners(me, scaleDownTargetNodeID);
-
callClosingListeners();
internalClose();
-
- for (Channel channel : channels.values()) {
- channel.returnBlocking(me);
- }
}
+
@Override
public void destroy() {
synchronized (failLock) {
diff --git
a/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
b/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
index deb97f65ec..da4ed86cf5 100644
---
a/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
+++
b/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
@@ -198,6 +198,14 @@ public class AssertionLoggerHandler extends
AbstractAppender implements Closeabl
}
}
+ public void clear() {
+ messages.clear();
+ }
+
+ public int getNumberOfMessages() {
+ return messages.size();
+ }
+
private static class LogEntry {
String message;
String stackTrace;
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/InVMCloseTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/InVMCloseTest.java
new file mode 100644
index 00..052513e957
--- /dev/null
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/InVMCloseTest.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.artemis.tests.integration;
+
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class InVMCloseTest extends ActiveMQTestBase {
+
+ protected ActiveMQServer server;
+
+ @
(activemq-website) branch main updated: Fixing more compilation problems in CMS example code
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new c02f6d47b Fixing more compilation problems in CMS example code c02f6d47b is described below commit c02f6d47bc32ae2e467b9b79d65c11fc97eaf4e0 Author: Justin Bertram AuthorDate: Thu Mar 7 21:30:22 2024 -0600 Fixing more compilation problems in CMS example code --- src/components/cms/overview.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/cms/overview.md b/src/components/cms/overview.md index f616b25e4..9b39b847b 100644 --- a/src/components/cms/overview.md +++ b/src/components/cms/overview.md @@ -198,7 +198,7 @@ std::auto_ptr connectionFactory( std::auto_ptr connection( connectionFactory->createConnection() ); // Create a new Session from our Connection -std::auto_ptr session( connection->createSession(); +std::auto_ptr session( connection->createSession() ); // Now create a Topic std::auto_ptr myTopic( session->createTopic( "EXAMPLE-TOPIC" ) ); @@ -219,7 +219,7 @@ std::auto_ptr connectionFactory( std::auto_ptr connection( connectionFactory->createConnection() ); // Create a new Session from our Connection -std::auto_ptr session( connection->createSession(); +std::auto_ptr session( connection->createSession() ); // Now create a Topic std::auto_ptr myTopic( session->createTopic( "EXAMPLE-TOPIC" ) ); @@ -303,7 +303,7 @@ std::auto_ptr connectionFactory( std::auto_ptr connection( connectionFactory->createConnection() ); // Create a new Session from our Connection -std::auto_ptr session( connection->createSession(); +std::auto_ptr session( connection->createSession() ); // Now create a Topic std::auto_ptr myTopic( session->createTopic( "EXAMPLE-TOPIC" ) );
(activemq-website) branch main updated: Fix compilation issue in CMS example code
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new 798e7fb44 Fix compilation issue in CMS example code 798e7fb44 is described below commit 798e7fb44e49b83ff097af196be1615f448fbea3 Author: Justin Bertram AuthorDate: Thu Mar 7 21:22:14 2024 -0600 Fix compilation issue in CMS example code --- src/components/cms/overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/cms/overview.md b/src/components/cms/overview.md index 7d77fa2c1..f616b25e4 100644 --- a/src/components/cms/overview.md +++ b/src/components/cms/overview.md @@ -162,7 +162,7 @@ std::auto_ptr connectionFactory( std::auto_ptr connection( connectionFactory->createConnection() ); // Create a new Session from our Connection -std::auto_ptr session( connection->createSession(); +std::auto_ptr session( connection->createSession() ); // Now create a TextMessage std::auto_ptr textMessage( session->createTextMessage() );
(activemq-artemis) branch main updated (9cd48602ab -> 3c580c9351)
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git from 9cd48602ab ARTEMIS-4664 Just fixing a typo on the test method name add 3c580c9351 ARTEMIS-4579 Add `peekFirstMessage*` and `peekFirstScheduledMessage*` functions No new revisions were added by this update. Summary of changes: .../apache/activemq/artemis/logs/AuditLogger.java | 28 + .../artemis/api/core/management/QueueControl.java | 13 +++ .../core/management/impl/QueueControlImpl.java | 86 ++ .../apache/activemq/artemis/core/server/Queue.java | 4 + .../core/server/ScheduledDeliveryHandler.java | 2 + .../artemis/core/server/impl/QueueImpl.java| 11 ++ .../server/impl/ScheduledDeliveryHandlerImpl.java | 36 ++ .../integration/management/QueueControlTest.java | 71 .../management/QueueControlUsingCoreTest.java | 16 +++ .../tests/leak/MessageReferenceLeakTest.java | 123 + 10 files changed, 390 insertions(+) create mode 100755 tests/leak-tests/src/test/java/org/apache/activemq/artemis/tests/leak/MessageReferenceLeakTest.java
(activemq-website) 01/01: Merge pull request #124 from CzyerChen/main
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git commit 43c66dd05dd7f746f2783ef5e10b683d9fcc10f9 Merge: 2235199f7 74efa4503 Author: Justin Bertram AuthorDate: Fri Mar 1 08:56:21 2024 -0600 Merge pull request #124 from CzyerChen/main Fix typo in jmx.md src/components/classic/documentation/jmx.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(activemq-website) branch main updated (2235199f7 -> 43c66dd05)
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git from 2235199f7 NO-JIRA yet one more fix security-advisories redirect add 74efa4503 Fix typo in jmx.md new 43c66dd05 Merge pull request #124 from CzyerChen/main The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/components/classic/documentation/jmx.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(activemq-website) branch main updated: NO-JIRA yet one more fix security-advisories redirect
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new 2235199f7 NO-JIRA yet one more fix security-advisories redirect 2235199f7 is described below commit 2235199f70a369c311b35405408f31bc3800f52a Author: Justin Bertram AuthorDate: Thu Feb 29 17:57:48 2024 -0600 NO-JIRA yet one more fix security-advisories redirect --- src/.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/.htaccess b/src/.htaccess index 573b1a1b9..efd80b7cc 100644 --- a/src/.htaccess +++ b/src/.htaccess @@ -411,7 +411,7 @@ RewriteRule ^scaling-queues(.*) https://activemq.apache.org/components/classic/d RewriteRule ^scaling-the-depth-of-a-queue(.*) https://activemq.apache.org/components/classic/documentation/scaling-the-depth-of-a-queue [R=301,L] RewriteRule ^security-advisories-apollo(.*) https://activemq.apache.org/security-advisories [R=301,L] RewriteRule ^security.html https://activemq.apache.org/components/classic/documentation/security [R=301,L] -RewriteRule ^security https://activemq.apache.org/components/classic/documentation/security [R=301,L] +RewriteRule ^security$ https://activemq.apache.org/components/classic/documentation/security [R=301,L] RewriteRule ^seda(.*) https://activemq.apache.org/components/classic/documentation/seda [R=301,L] RewriteRule ^selectors(.*) https://activemq.apache.org/components/classic/documentation/selectors [R=301,L] RewriteRule ^setting-up-activemq-with-tomcat-559(.*) https://activemq.apache.org/components/classic/documentation/setting-up-activemq-classic-with-tomcat-559 [R=301,L]
(activemq-website) branch main updated: NO-JIRA yet another fix security-advisories redirect
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new b241a1cef NO-JIRA yet another fix security-advisories redirect b241a1cef is described below commit b241a1cef08a57604119cea9a9466fd5a2566e40 Author: Justin Bertram AuthorDate: Thu Feb 29 17:51:57 2024 -0600 NO-JIRA yet another fix security-advisories redirect --- src/.htaccess | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/.htaccess b/src/.htaccess index f9013deed..573b1a1b9 100644 --- a/src/.htaccess +++ b/src/.htaccess @@ -410,8 +410,8 @@ RewriteRule ^sandbox(.*) https://activemq.apache.org/components/classic/document RewriteRule ^scaling-queues(.*) https://activemq.apache.org/components/classic/documentation/scaling-queues [R=301,L] RewriteRule ^scaling-the-depth-of-a-queue(.*) https://activemq.apache.org/components/classic/documentation/scaling-the-depth-of-a-queue [R=301,L] RewriteRule ^security-advisories-apollo(.*) https://activemq.apache.org/security-advisories [R=301,L] -RewriteRule ^security-advisories(.*) https://activemq.apache.org/security-advisories [R=301,L] -RewriteRule ^security(.*) https://activemq.apache.org/components/classic/documentation/security [R=301,L] +RewriteRule ^security.html https://activemq.apache.org/components/classic/documentation/security [R=301,L] +RewriteRule ^security https://activemq.apache.org/components/classic/documentation/security [R=301,L] RewriteRule ^seda(.*) https://activemq.apache.org/components/classic/documentation/seda [R=301,L] RewriteRule ^selectors(.*) https://activemq.apache.org/components/classic/documentation/selectors [R=301,L] RewriteRule ^setting-up-activemq-with-tomcat-559(.*) https://activemq.apache.org/components/classic/documentation/setting-up-activemq-classic-with-tomcat-559 [R=301,L]
(activemq-website) branch main updated: NO-JIRA another fix security-advisories redirect
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new 4f2c3b7f1 NO-JIRA another fix security-advisories redirect 4f2c3b7f1 is described below commit 4f2c3b7f1aa970070ce912cec7fb764b38d7bc2e Author: Justin Bertram AuthorDate: Thu Feb 29 17:44:12 2024 -0600 NO-JIRA another fix security-advisories redirect --- src/.htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/src/.htaccess b/src/.htaccess index 4b063fbbf..f9013deed 100644 --- a/src/.htaccess +++ b/src/.htaccess @@ -410,6 +410,7 @@ RewriteRule ^sandbox(.*) https://activemq.apache.org/components/classic/document RewriteRule ^scaling-queues(.*) https://activemq.apache.org/components/classic/documentation/scaling-queues [R=301,L] RewriteRule ^scaling-the-depth-of-a-queue(.*) https://activemq.apache.org/components/classic/documentation/scaling-the-depth-of-a-queue [R=301,L] RewriteRule ^security-advisories-apollo(.*) https://activemq.apache.org/security-advisories [R=301,L] +RewriteRule ^security-advisories(.*) https://activemq.apache.org/security-advisories [R=301,L] RewriteRule ^security(.*) https://activemq.apache.org/components/classic/documentation/security [R=301,L] RewriteRule ^seda(.*) https://activemq.apache.org/components/classic/documentation/seda [R=301,L] RewriteRule ^selectors(.*) https://activemq.apache.org/components/classic/documentation/selectors [R=301,L]
(activemq-website) branch main updated: NO-JIRA fix security-advisories redirect
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new 0331f3d3d NO-JIRA fix security-advisories redirect 0331f3d3d is described below commit 0331f3d3d32a8323e1372dd6df667dd47d6e4662 Author: Justin Bertram AuthorDate: Thu Feb 29 17:20:53 2024 -0600 NO-JIRA fix security-advisories redirect --- src/.htaccess | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/.htaccess b/src/.htaccess index 27c29dc63..4b063fbbf 100644 --- a/src/.htaccess +++ b/src/.htaccess @@ -409,8 +409,7 @@ RewriteRule ^sample-report(.*) https://activemq.apache.org/components/classic/do RewriteRule ^sandbox(.*) https://activemq.apache.org/components/classic/documentation/sandbox [R=301,L] RewriteRule ^scaling-queues(.*) https://activemq.apache.org/components/classic/documentation/scaling-queues [R=301,L] RewriteRule ^scaling-the-depth-of-a-queue(.*) https://activemq.apache.org/components/classic/documentation/scaling-the-depth-of-a-queue [R=301,L] -RewriteRule ^security-advisories-apollo(.*) https://activemq.apache.org/components/classic/documentation/security-advisories-apollo [R=301,L] -RewriteRule ^security-advisories(.*) https://activemq.apache.org/components/classic/documentation/security-advisories [R=301,L] +RewriteRule ^security-advisories-apollo(.*) https://activemq.apache.org/security-advisories [R=301,L] RewriteRule ^security(.*) https://activemq.apache.org/components/classic/documentation/security [R=301,L] RewriteRule ^seda(.*) https://activemq.apache.org/components/classic/documentation/seda [R=301,L] RewriteRule ^selectors(.*) https://activemq.apache.org/components/classic/documentation/selectors [R=301,L]
(activemq-artemis) branch main updated: NO-JIRA add optional metrics doc details
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new b10e752e6e NO-JIRA add optional metrics doc details b10e752e6e is described below commit b10e752e6e9d99b1ea04cb38400cdc8645c1fa36 Author: Justin Bertram AuthorDate: Wed Feb 28 14:07:57 2024 -0600 NO-JIRA add optional metrics doc details --- docs/user-manual/metrics.adoc | 40 +--- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/docs/user-manual/metrics.adoc b/docs/user-manual/metrics.adoc index e94cdc4709..dcae56ecd5 100644 --- a/docs/user-manual/metrics.adoc +++ b/docs/user-manual/metrics.adoc @@ -85,13 +85,39 @@ However, these metrics can be deduced by aggregating the lower level metrics (e. === Optional metrics -* JVM memory metrics (exported by default) -* JVM GC -* JVM thread -* https://netty.io/4.1/api/io/netty/buffer/PooledByteBufAllocatorMetric.html[Netty] -* File descriptors -* Processor -* Uptime +There are a handful of other useful metrics that are related to the JVM, the underlying operating system, etc. + +JVM memory metrics:: +Gauges buffer and memory pool utilization. +Underlying data gathered from Java's https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/BufferPoolMXBean.html[BufferPoolMXBeans] and https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/MemoryPoolMXBean.html[MemoryPoolMXBeans]. ++ +Enabled by default. +JVM GC:: +Gauges max and live data size, promotion and allocation rates, and the number of times the GC pauses (or concurrent phase time in the case of CMS). +Underlying data gathered from Java's https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/MemoryPoolMXBean.html[MemoryPoolMXBeans]. ++ +Disabled by default. +JVM thread:: +Gauges thread peak, the number of daemon threads, and live threads. +Underlying data gathered from Java's https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/ThreadMXBean.html[ThreadMXBean]. ++ +Disabled by default. +Netty:: +Collects metrics from Netty's https://netty.io/4.1/api/io/netty/buffer/PooledByteBufAllocatorMetric.html[PooledByteBufAllocatorMetric]. ++ +Disabled by default. +File descriptors:: +Gauges current and max-allowed open files. ++ +Disabled by default. +Processor:: +Gauges system CPU count, CPU usage, and 1-minute load average as well as process CPU usage. ++ +Disabled by default. +Uptime:: +Gauges process start time and uptime. ++ +Disabled by default. == Configuration
(activemq-artemis) branch main updated: ARTEMIS-4646 Reuse only acknowledged MQTT IDs
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new f4b59c9b25 ARTEMIS-4646 Reuse only acknowledged MQTT IDs
f4b59c9b25 is described below
commit f4b59c9b25d10f5738518c7115febff37a32d0b2
Author: Albertas Vyšniauskas
AuthorDate: Tue Feb 20 22:47:15 2024 +0200
ARTEMIS-4646 Reuse only acknowledged MQTT IDs
Generate MQTT message IDs from full allowed range of 1-65535 and skip
currently used values. Do not use atomic integer for current ID, because
all accesses and modifications are performed in synchronized context.
---
.../core/protocol/mqtt/MQTTSessionState.java | 19 ---
.../artemis/tests/integration/mqtt/MQTTTest.java | 59 +-
2 files changed, 69 insertions(+), 9 deletions(-)
diff --git
a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTSessionState.java
b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTSessionState.java
index ad354345ec..7a4208bc83 100644
---
a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTSessionState.java
+++
b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTSessionState.java
@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Pattern;
import io.netty.buffer.ByteBuf;
@@ -444,14 +443,13 @@ public class MQTTSessionState {
}
public class OutboundStore {
-
private HashMap, Integer> artemisToMqttMessageMap = new
HashMap<>();
private HashMap> mqttToServerIds = new
HashMap<>();
private final Object dataStoreLock = new Object();
- private final AtomicInteger ids = new AtomicInteger(0);
+ private int currentId = 0;
private Pair generateKey(long messageId, long consumerID) {
return new Pair<>(messageId, consumerID);
@@ -461,8 +459,14 @@ public class MQTTSessionState {
synchronized (dataStoreLock) {
Integer id = artemisToMqttMessageMap.get(generateKey(messageId,
consumerId));
if (id == null) {
- ids.compareAndSet(Short.MAX_VALUE, 1);
- id = ids.addAndGet(1);
+ do {
+ if (currentId == MQTTUtil.TWO_BYTE_INT_MAX) {
+ currentId = 0;
+ }
+ ++currentId;
+ }
+ while (mqttToServerIds.containsKey(currentId));
+ id = currentId;
}
return id;
}
@@ -478,9 +482,8 @@ public class MQTTSessionState {
public Pair publishAckd(int mqtt) {
synchronized (dataStoreLock) {
-Pair p = mqttToServerIds.remove(mqtt);
+Pair p = mqttToServerIds.remove(mqtt);
if (p != null) {
- mqttToServerIds.remove(p.getA());
artemisToMqttMessageMap.remove(p);
}
return p;
@@ -511,7 +514,7 @@ public class MQTTSessionState {
synchronized (dataStoreLock) {
artemisToMqttMessageMap.clear();
mqttToServerIds.clear();
-ids.set(0);
+currentId = 0;
}
}
}
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTest.java
index 4575e29aa7..d677c17185 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/MQTTTest.java
@@ -423,7 +423,7 @@ public class MQTTTest extends MQTTTestSupport {
@Ignore
@Test(timeout = 600 * 1000)
public void testSendMoreThanUniqueId() throws Exception {
- int messages = (Short.MAX_VALUE * 2) + 1;
+ int messages = MQTTUtil.TWO_BYTE_INT_MAX;
final MQTTClientProvider publisher = getMQTTClientProvider();
initializeConnection(publisher);
@@ -447,6 +447,63 @@ public class MQTTTest extends MQTTTestSupport {
publisher.disconnect();
}
+ @Test(timeout = 600 * 1000)
+ public void testNoMessageIdReuseBeforeAcknowledgment() throws Exception {
+ final int messages = MQTTUtil.TWO_BYTE_INT_MAX;
+
+ final MQTTClientProvider publisher = getMQTTClientProvider();
+ initializeConnection(publisher);
+
+ final MQTT mqtt = createMQTTConnection();
+ mqtt.setClientId("foo");
+ fin
(activemq-artemis) branch main updated: Clarify classic wording
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 7d3ed3e0de Clarify classic wording 7d3ed3e0de is described below commit 7d3ed3e0dea07353d2f4e5f74a57a2d3ff3cb2da Author: Justin Bertram AuthorDate: Mon Feb 19 16:06:40 2024 -0600 Clarify classic wording --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c06af16a3f..b3109ce499 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,10 @@ The [ActiveMQ Artemis Examples](https://github.com/apache/activemq-artemis-examp See the [Hacking Guide](https://activemq.apache.org/components/artemis/documentation/hacking-guide/) for details about modifying the code, building the project, running tests, IDE integration, etc. -## Migrate from ActiveMQ "Classic" +## Migrate from ActiveMQ Classic -See the [Migration Guide](https://activemq.apache.org/components/artemis/migration-documentation/) for information about the architectural and configuration differences between ActiveMQ "Classic" (i.e. 5.x) and ActiveMQ Artemis. +See the [Migration Guide](https://activemq.apache.org/components/artemis/migration-documentation/) for information about the architectural and configuration differences between ActiveMQ Classic and ActiveMQ Artemis. ## Report an Issue -See [our website](https://activemq.apache.org/issues) for details on how to report an bug, request a feature, etc. \ No newline at end of file +See [our website](https://activemq.apache.org/issues) for details on how to report an bug, request a feature, etc.
(activemq-artemis) branch main updated: ARTEMIS-4649 Use unique STOMP message ID per subscription
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 0d1d88a72a ARTEMIS-4649 Use unique STOMP message ID per subscription
0d1d88a72a is described below
commit 0d1d88a72a68ef32d3fc3fe477a343168c6b310d
Author: Albertas Vyšniauskas
AuthorDate: Mon Feb 19 18:47:02 2024 +0200
ARTEMIS-4649 Use unique STOMP message ID per subscription
Use combined consumer and message ID as STOMP message ID.
---
.../stomp/ActiveMQStompProtocolMessageBundle.java | 2 +-
.../core/protocol/stomp/StompConnection.java | 4 +-
.../artemis/core/protocol/stomp/StompSession.java | 44 +++
.../artemis/core/protocol/stomp/StompUtils.java| 1 -
.../protocol/stomp/VersionedStompFrameHandler.java | 9 +++-
.../protocol/stomp/v12/StompFrameHandlerV12.java | 6 ++-
.../artemis/tests/integration/stomp/StompTest.java | 27 ++
.../tests/integration/stomp/StompTestBase.java | 4 +-
.../tests/integration/stomp/v11/StompV11Test.java | 33 ++--
.../tests/integration/stomp/v12/StompV12Test.java | 63 +++---
10 files changed, 153 insertions(+), 40 deletions(-)
diff --git
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
index 5fa936704e..faea309642 100644
---
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
+++
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
@@ -104,7 +104,7 @@ public interface ActiveMQStompProtocolMessageBundle {
String invalidFrame(String dumpByteArray);
@Message(id = 339025, value = "failed to ack because no message with id:
{}")
- ActiveMQStompException failToAckMissingID(long id);
+ ActiveMQStompException failToAckMissingID(String id);
@Message(id = 339026, value = "subscription id {} does not match {}")
ActiveMQStompException subscriptionIDMismatch(String subscriptionID, String
actualID);
diff --git
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
index abb40f5082..b7835548a9 100644
---
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
+++
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
@@ -43,6 +43,7 @@ import
org.apache.activemq.artemis.core.protocol.stomp.v12.StompFrameHandlerV12;
import org.apache.activemq.artemis.core.remoting.FailureListener;
import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
+import org.apache.activemq.artemis.core.server.ServerConsumer;
import org.apache.activemq.artemis.core.server.ServerSession;
import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
@@ -624,8 +625,9 @@ public final class StompConnection extends
AbstractRemotingConnection {
public StompFrame createStompMessage(ICoreMessage message,
StompSubscription subscription,
+ServerConsumer consumer,
int deliveryCount) {
- return frameHandler.createMessageFrame(message, subscription,
deliveryCount);
+ return frameHandler.createMessageFrame(message, subscription, consumer,
deliveryCount);
}
public void addStompEventListener(FrameEventListener listener) {
diff --git
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
index be99605d20..cd1b7dc25f 100644
---
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
+++
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
@@ -78,8 +78,8 @@ public class StompSession implements SessionCallback {
private final Map subscriptions = new
ConcurrentHashMap<>();
- // key = message ID, value = consumer ID
- private fina
(activemq-website) branch main updated: Fix redirects for Classic release pages
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new 40a1c6d7c Fix redirects for Classic release pages 40a1c6d7c is described below commit 40a1c6d7cdc96cec531f136ae250290bc23c4154 Author: Justin Bertram AuthorDate: Thu Feb 15 11:16:59 2024 -0600 Fix redirects for Classic release pages --- src/_classic_releases/classic-05-00-00.md | 3 ++- src/_classic_releases/classic-05-01-00.md | 7 --- src/_classic_releases/classic-05-02-00.md | 3 ++- src/_classic_releases/classic-05-03-00.md | 3 ++- src/_classic_releases/classic-05-03-01.md | 3 ++- src/_classic_releases/classic-05-03-02.md | 3 ++- src/_classic_releases/classic-05-04-00.md | 3 ++- src/_classic_releases/classic-05-04-01.md | 5 +++-- src/_classic_releases/classic-05-04-02.md | 5 +++-- src/_classic_releases/classic-05-04-03.md | 3 ++- src/_classic_releases/classic-05-05-00.md | 3 ++- src/_classic_releases/classic-05-05-01.md | 3 ++- src/_classic_releases/classic-05-06-00.md | 3 ++- src/_classic_releases/classic-05-07-00.md | 3 ++- src/_classic_releases/classic-05-08-00.md | 7 --- src/_classic_releases/classic-05-09-00.md | 3 ++- src/_classic_releases/classic-05-09-01.md | 3 ++- src/_classic_releases/classic-05-10-00.md | 3 ++- src/_classic_releases/classic-05-10-01.md | 3 ++- src/_classic_releases/classic-05-10-02.md | 5 +++-- src/_classic_releases/classic-05-11-00.md | 7 --- src/_classic_releases/classic-05-11-01.md | 3 ++- src/_classic_releases/classic-05-11-02.md | 3 ++- src/_classic_releases/classic-05-11-03.md | 3 ++- src/_classic_releases/classic-05-12-00.md | 3 ++- src/_classic_releases/classic-05-12-01.md | 3 ++- src/_classic_releases/classic-05-12-02.md | 3 ++- src/_classic_releases/classic-05-13-00.md | 3 ++- src/_classic_releases/classic-05-13-01.md | 3 ++- src/_classic_releases/classic-05-13-02.md | 3 ++- src/_classic_releases/classic-05-13-03.md | 3 ++- src/_classic_releases/classic-05-13-04.md | 3 ++- src/_classic_releases/classic-05-14-00.md | 3 ++- src/_classic_releases/classic-05-14-01.md | 3 ++- src/_classic_releases/classic-05-14-02.md | 3 ++- src/_classic_releases/classic-05-14-03.md | 3 ++- src/_classic_releases/classic-05-14-04.md | 3 ++- src/_classic_releases/classic-05-14-05.md | 3 ++- src/_classic_releases/classic-05-15-00.md | 5 +++-- src/_classic_releases/classic-05-15-01.md | 5 +++-- src/_classic_releases/classic-05-15-02.md | 5 +++-- src/_classic_releases/classic-05-15-03.md | 5 +++-- src/_classic_releases/classic-05-15-04.md | 5 +++-- src/_classic_releases/classic-05-15-05.md | 5 +++-- src/_classic_releases/classic-05-15-06.md | 5 +++-- src/_classic_releases/classic-05-15-07.md | 5 +++-- src/_classic_releases/classic-05-15-08.md | 5 +++-- src/_classic_releases/classic-05-15-09.md | 5 +++-- src/_classic_releases/classic-05-15-10.md | 5 +++-- src/_classic_releases/classic-05-15-11.md | 3 ++- src/_classic_releases/classic-05-15-12.md | 3 ++- src/_classic_releases/classic-05-15-13.md | 3 ++- src/_classic_releases/classic-05-15-14.md | 3 ++- src/_classic_releases/classic-05-15-15.md | 4 +++- src/_classic_releases/classic-05-15-16.md | 2 ++ src/_classic_releases/classic-05-16-00.md | 3 ++- src/_classic_releases/classic-05-16-01.md | 3 ++- src/_classic_releases/classic-05-16-02.md | 2 ++ src/_classic_releases/classic-05-16-03.md | 2 ++ src/_classic_releases/classic-05-16-04.md | 2 ++ src/_classic_releases/classic-05-16-05.md | 2 ++ src/_classic_releases/classic-05-16-06.md | 2 ++ src/_classic_releases/classic-05-16-07.md | 2 ++ src/_classic_releases/classic-05-17-00.md | 2 ++ src/_classic_releases/classic-05-17-01.md | 2 ++ src/_classic_releases/classic-05-17-02.md | 2 ++ src/_classic_releases/classic-05-17-03.md | 2 ++ src/_classic_releases/classic-05-17-04.md | 2 ++ src/_classic_releases/classic-05-17-05.md | 4 +++- src/_classic_releases/classic-05-17-06.md | 4 +++- src/_classic_releases/classic-05-18-00.md | 2 ++ src/_classic_releases/classic-05-18-01.md | 6 -- src/_classic_releases/classic-05-18-02.md | 6 -- src/_classic_releases/classic-05-18-03.md | 6 -- src/_classic_releases/classic-06-00-00.md | 4 +++- src/_classic_releases/classic-06-00-01.md | 6 -- 76 files changed, 184 insertions(+), 87 deletions(-) diff --git a/src/_classic_releases/classic-05-00-00.md b/src/_classic_releases/classic-05-00-00.md index 8e31b04c3..c2e1c08b4 100644 --- a/src/_classic_releases/classic-05-00-00.md +++ b/src/_classic_releases/classic-05-00-00.md @@ -1,10 +1,11 @@ --- layout: default_md -title: ActiveMQ Classic 5.0.0 Release +title: ActiveMQ Classic 5.0.0 Release title-class: page-title-classic type: classic redirect_from: - /../../../activemq-500-release +- /../../../activemq-500-release --- diff --git a/src
(activemq-website) branch main updated: More clean-up for Classic release pages
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new 7d11f8813 More clean-up for Classic release pages 7d11f8813 is described below commit 7d11f88139da15bce05dd0ef17c7601f8be5ca2e Author: Justin Bertram AuthorDate: Thu Feb 15 10:09:32 2024 -0600 More clean-up for Classic release pages --- src/_classic_releases/classic-05-00-00.md | 2 -- src/_classic_releases/classic-05-01-00.md | 8 +--- src/_classic_releases/classic-05-02-00.md | 4 src/_classic_releases/classic-05-03-00.md | 2 -- src/_classic_releases/classic-05-03-01.md | 2 -- src/_classic_releases/classic-05-03-02.md | 2 -- src/_classic_releases/classic-05-04-00.md | 2 -- src/_classic_releases/classic-05-04-01.md | 2 -- src/_classic_releases/classic-05-04-02.md | 2 -- src/_classic_releases/classic-05-04-03.md | 2 -- src/_classic_releases/classic-05-05-00.md | 2 -- src/_classic_releases/classic-05-05-01.md | 2 -- src/_classic_releases/classic-05-06-00.md | 2 -- src/_classic_releases/classic-05-07-00.md | 2 -- src/_classic_releases/classic-05-08-00.md | 2 -- src/_classic_releases/classic-05-09-00.md | 2 -- src/_classic_releases/classic-05-09-01.md | 2 -- src/_classic_releases/classic-05-10-00.md | 5 - src/_classic_releases/classic-05-10-01.md | 5 - src/_classic_releases/classic-05-10-02.md | 5 - src/_classic_releases/classic-05-11-00.md | 2 -- src/_classic_releases/classic-05-11-01.md | 5 - src/_classic_releases/classic-05-11-02.md | 5 - src/_classic_releases/classic-05-11-03.md | 5 - src/_classic_releases/classic-05-12-00.md | 5 - src/_classic_releases/classic-05-12-01.md | 5 - src/_classic_releases/classic-05-12-02.md | 5 - src/_classic_releases/classic-05-13-00.md | 5 - src/_classic_releases/classic-05-13-01.md | 5 - src/_classic_releases/classic-05-13-02.md | 5 - src/_classic_releases/classic-05-13-03.md | 5 - src/_classic_releases/classic-05-13-04.md | 5 - src/_classic_releases/classic-05-14-00.md | 5 - src/_classic_releases/classic-05-14-01.md | 5 - src/_classic_releases/classic-05-14-02.md | 5 - src/_classic_releases/classic-05-14-03.md | 5 - src/_classic_releases/classic-05-14-04.md | 5 - src/_classic_releases/classic-05-14-05.md | 5 - src/_classic_releases/classic-05-15-00.md | 5 - src/_classic_releases/classic-05-15-01.md | 5 - src/_classic_releases/classic-05-15-02.md | 5 - src/_classic_releases/classic-05-15-03.md | 5 - src/_classic_releases/classic-05-15-04.md | 5 - src/_classic_releases/classic-05-15-05.md | 5 - src/_classic_releases/classic-05-15-06.md | 9 ++--- src/_classic_releases/classic-05-15-07.md | 9 ++--- src/_classic_releases/classic-05-15-08.md | 9 ++--- src/_classic_releases/classic-05-15-09.md | 9 ++--- src/_classic_releases/classic-05-15-10.md | 5 - 49 files changed, 9 insertions(+), 206 deletions(-) diff --git a/src/_classic_releases/classic-05-00-00.md b/src/_classic_releases/classic-05-00-00.md index 825227930..8e31b04c3 100644 --- a/src/_classic_releases/classic-05-00-00.md +++ b/src/_classic_releases/classic-05-00-00.md @@ -7,8 +7,6 @@ redirect_from: - /../../../activemq-500-release --- -[Overview](overview) > [Download](download) > [ActiveMQ Classic 5.0.0 Release](classic-05-00-00) - This is an older release. To get the current release, please see the download page. diff --git a/src/_classic_releases/classic-05-01-00.md b/src/_classic_releases/classic-05-01-00.md index 062429043..5300c0d0f 100644 --- a/src/_classic_releases/classic-05-01-00.md +++ b/src/_classic_releases/classic-05-01-00.md @@ -7,8 +7,6 @@ redirect_from: - /../../../activemq-510-release --- -[Overview](overview) > [Download](download) > [ActiveMQ Classic 5.1.0 Release](classic-05-01-00) - This is an older release. To get the current release, please see the download page. @@ -18,11 +16,7 @@ New Features in 5.1 In the 5.1.x release of Apache ActiveMQ Classic there are the following new features: -* You can use the new [DestinationSource](http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/advisory/DestinationSource.html) on an ActiveMQConnection to access the available queues or topics or listen to queues/topics being created or deleted. - -New Features in 5.1 ---- - +* You can use the new [DestinationSource](http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/advisory/DestinationSource.html) on an ActiveMQConnection to access the available queues or topics or listen to queues/topics being created or deleted. * Support for more graceful handling of [timeouts within MessageProducer.send](http://issues.apache.org/activemq/bro
(activemq-website) branch main updated: Fix Classic release redirection & links
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new 76ee1b69f Fix Classic release redirection & links 76ee1b69f is described below commit 76ee1b69f247d755bed02e7a6cce9491e4e6fe9e Author: Justin Bertram AuthorDate: Thu Feb 15 09:48:26 2024 -0600 Fix Classic release redirection & links --- src/_classic_releases/classic-05-00-00.md | 6 ++ src/_classic_releases/classic-05-01-00.md | 6 +++--- src/_classic_releases/classic-05-02-00.md | 6 +++--- src/_classic_releases/classic-05-03-00.md | 6 +++--- src/_classic_releases/classic-05-03-01.md | 6 +++--- src/_classic_releases/classic-05-03-02.md | 6 +++--- src/_classic_releases/classic-05-04-00.md | 8 src/_classic_releases/classic-05-04-01.md | 8 src/_classic_releases/classic-05-04-02.md | 8 src/_classic_releases/classic-05-04-03.md | 6 +++--- src/_classic_releases/classic-05-05-00.md | 8 src/_classic_releases/classic-05-05-01.md | 6 +++--- src/_classic_releases/classic-05-06-00.md | 6 +++--- src/_classic_releases/classic-05-07-00.md | 6 +++--- src/_classic_releases/classic-05-08-00.md | 6 +++--- src/_classic_releases/classic-05-09-00.md | 6 +++--- src/_classic_releases/classic-05-09-01.md | 6 +++--- src/_classic_releases/classic-05-10-00.md | 6 +++--- src/_classic_releases/classic-05-10-01.md | 6 +++--- src/_classic_releases/classic-05-10-02.md | 6 +++--- src/_classic_releases/classic-05-11-00.md | 6 +++--- src/_classic_releases/classic-05-11-01.md | 6 +++--- src/_classic_releases/classic-05-11-02.md | 6 +++--- src/_classic_releases/classic-05-11-03.md | 6 +++--- src/_classic_releases/classic-05-12-00.md | 6 +++--- src/_classic_releases/classic-05-12-01.md | 6 +++--- src/_classic_releases/classic-05-12-02.md | 6 +++--- src/_classic_releases/classic-05-13-00.md | 6 +++--- src/_classic_releases/classic-05-13-01.md | 6 +++--- src/_classic_releases/classic-05-13-02.md | 6 +++--- src/_classic_releases/classic-05-13-03.md | 6 +++--- src/_classic_releases/classic-05-13-04.md | 6 +++--- src/_classic_releases/classic-05-14-00.md | 6 +++--- src/_classic_releases/classic-05-14-01.md | 6 +++--- src/_classic_releases/classic-05-14-02.md | 6 +++--- src/_classic_releases/classic-05-14-03.md | 6 +++--- src/_classic_releases/classic-05-14-04.md | 6 +++--- src/_classic_releases/classic-05-14-05.md | 6 +++--- src/_classic_releases/classic-05-15-00.md | 6 +++--- src/_classic_releases/classic-05-15-01.md | 6 +++--- src/_classic_releases/classic-05-15-02.md | 6 +++--- src/_classic_releases/classic-05-15-03.md | 6 +++--- src/_classic_releases/classic-05-15-04.md | 6 +++--- src/_classic_releases/classic-05-15-05.md | 6 +++--- src/_classic_releases/classic-05-15-06.md | 6 +++--- src/_classic_releases/classic-05-15-07.md | 6 +++--- src/_classic_releases/classic-05-15-08.md | 6 +++--- src/_classic_releases/classic-05-15-09.md | 6 +++--- src/_classic_releases/classic-05-15-10.md | 6 +++--- src/_classic_releases/classic-05-15-11.md | 2 +- src/_classic_releases/classic-05-15-12.md | 2 +- src/_classic_releases/classic-05-15-13.md | 2 +- src/_classic_releases/classic-05-15-14.md | 2 +- src/_classic_releases/classic-05-16-00.md | 2 +- src/_classic_releases/classic-05-16-01.md | 2 +- 55 files changed, 156 insertions(+), 158 deletions(-) diff --git a/src/_classic_releases/classic-05-00-00.md b/src/_classic_releases/classic-05-00-00.md index 6059dbead..825227930 100644 --- a/src/_classic_releases/classic-05-00-00.md +++ b/src/_classic_releases/classic-05-00-00.md @@ -4,10 +4,10 @@ title: ActiveMQ Classic 5.0.0 Release title-class: page-title-classic type: classic redirect_from: -- /components/classic/download/activemq-500-release +- /../../../activemq-500-release --- -[Overview](overview) > [Download](download) > [ActiveMQ Classic 5.0.0 Release](activemq-500-release) +[Overview](overview) > [Download](download) > [ActiveMQ Classic 5.0.0 Release](classic-05-00-00) This is an older release. To get the current release, please see the download page. @@ -74,5 +74,3 @@ For a more detailed view of new features and bug fixes, see the [release notes]( JIRA Issues Macro: Data cannot be retrieved due to an unexpected error -Also see the previous [ActiveMQ Classic 4.1.1 Release](activemq-411-release) - diff --git a/src/_classic_releases/classic-05-01-00.md b/src/_classic_releases/classic-05-01-00.md index 085162ddb..062429043 100644 --- a/src/_classic_releases/classic-05-01-00.md +++ b/src/_classic_releases/classic-05-01-00.md @@ -4,10 +4,10 @@ title: ActiveMQ Classic 5.1.0 Release title-class: page-title-classic type: classic redirect_from: -- /components/classic/download/activemq-510-release +- /../../../activemq-510-release --- -[Overview](overview) &
(activemq-website) branch main updated: Repair .htaccess
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new db28b3745 Repair .htaccess db28b3745 is described below commit db28b37452ef22e41548753d815b363138c0ff88 Author: Justin Bertram AuthorDate: Thu Feb 15 08:27:28 2024 -0600 Repair .htaccess --- src/.htaccess | 4 1 file changed, 4 deletions(-) diff --git a/src/.htaccess b/src/.htaccess index ca109bbae..27c29dc63 100644 --- a/src/.htaccess +++ b/src/.htaccess @@ -99,9 +99,7 @@ RewriteRule ^connectivity(.*) https://activemq.apache.org/components/classic/doc RewriteRule ^consumer-dispatch-async(.*) https://activemq.apache.org/components/classic/documentation/consumer-dispatch-async [R=301,L] RewriteRule ^consumer-features(.*) https://activemq.apache.org/components/classic/documentation/consumer-features [R=301,L] RewriteRule ^consumer-priority(.*) https://activemq.apache.org/components/classic/documentation/consumer-priority [R=301,L] -RewriteRule ^contact(.*) https://activemq.apache.org/components/classic/documentation/contact [R=301,L] RewriteRule ^containers(.*) https://activemq.apache.org/components/classic/documentation/containers [R=301,L] -RewriteRule ^contributing(.*) https://activemq.apache.org/components/classic/documentation/contributing [R=301,L] RewriteRule ^could-not-find-packetreader-for-packet-type-unknown-packet-type(.*) https://activemq.apache.org/components/classic/documentation/could-not-find-packetreader-for-packet-type-unknown-packet-type [R=301,L] RewriteRule ^cross-language-clients(.*) https://activemq.apache.org/components/classic/documentation/cross-language-clients [R=301,L] RewriteRule ^delay-and-schedule-message-delivery(.*) https://activemq.apache.org/components/classic/documentation/delay-and-schedule-message-delivery [R=301,L] @@ -259,7 +257,6 @@ RewriteRule ^integration-tests(.*) https://activemq.apache.org/components/classi RewriteRule ^interceptors(.*) https://activemq.apache.org/components/classic/documentation/interceptors [R=301,L] RewriteRule ^ioexception-could-not-find-class-for-resource(.*) https://activemq.apache.org/components/classic/documentation/ioexception-could-not-find-class-for-resource [R=301,L] RewriteRule ^i-see-nc-client-ids-what-does-that-mean(.*) https://activemq.apache.org/components/classic/documentation/i-see-nc-client-ids-what-does-that-mean [R=301,L] -RewriteRule ^issues(.*) https://activemq.apache.org/components/classic/documentation/issues [R=301,L] RewriteRule ^is-there-a-specified-size-of-the-journal(.*) https://activemq.apache.org/components/classic/documentation/is-there-a-specified-size-of-the-journal [R=301,L] RewriteRule ^j2ee(.*) https://activemq.apache.org/components/classic/documentation/j2ee [R=301,L] RewriteRule ^javadocs(.*) https://activemq.apache.org/components/classic/documentation/javadocs [R=301,L] @@ -445,7 +442,6 @@ RewriteRule ^structured-message-properties-and-mapmessages(.*) https://activemq. RewriteRule ^subscription-recovery-policy(.*) https://activemq.apache.org/components/classic/documentation/subscription-recovery-policy [R=301,L] RewriteRule ^sun-jndi(.*) https://activemq.apache.org/components/classic/documentation/sun-jndi [R=301,L] RewriteRule ^supporting-io-streams(.*) https://activemq.apache.org/components/classic/documentation/supporting-io-streams [R=301,L] -RewriteRule ^support(.*) https://activemq.apache.org/components/classic/documentation/support [R=301,L] RewriteRule ^svn(.*) https://activemq.apache.org/components/classic/documentation/svn [R=301,L] RewriteRule ^sybase(.*) https://activemq.apache.org/components/classic/documentation/sybase [R=301,L] RewriteRule ^tcp-transport-reference(.*) https://activemq.apache.org/components/classic/documentation/tcp-transport-reference [R=301,L]
(activemq-website) branch main updated: Upgrade JQuery & Font Awesome
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new 54de1f0b6 Upgrade JQuery & Font Awesome 54de1f0b6 is described below commit 54de1f0b6068e44955342a7003975d9574802d8d Author: Justin Bertram AuthorDate: Wed Feb 14 15:27:39 2024 -0600 Upgrade JQuery & Font Awesome --- src/_includes/head.html| 4 +- .../download/cherry-pick-report-2.19.1.html| 4 +- .../artemis/download/commit-report-2.10.0.html | 4 +- .../artemis/download/commit-report-2.10.1.html | 4 +- .../artemis/download/commit-report-2.11.0.html | 4 +- .../artemis/download/commit-report-2.12.0.html | 4 +- .../artemis/download/commit-report-2.13.0.html | 4 +- .../artemis/download/commit-report-2.14.0.html | 4 +- .../artemis/download/commit-report-2.15.0.html | 4 +- .../artemis/download/commit-report-2.16.0.html | 4 +- .../artemis/download/commit-report-2.17.0.html | 4 +- .../artemis/download/commit-report-2.18.0.html | 4 +- .../artemis/download/commit-report-2.19.0.html | 4 +- .../artemis/download/commit-report-2.19.1.html | 4 +- .../artemis/download/commit-report-2.20.0.html | 4 +- .../artemis/download/commit-report-2.21.0.html | 4 +- .../artemis/download/commit-report-2.22.0.html | 4 +- .../artemis/download/commit-report-2.23.0.html | 4 +- .../artemis/download/commit-report-2.23.1.html | 4 +- .../artemis/download/commit-report-2.24.0.html | 4 +- .../artemis/download/commit-report-2.25.0.html | 4 +- .../artemis/download/commit-report-2.26.0.html | 4 +- .../artemis/download/commit-report-2.27.0.html | 23 +-- .../artemis/download/commit-report-2.27.1.html | 23 +-- .../artemis/download/commit-report-2.28.0.html | 23 +-- .../artemis/download/commit-report-2.29.0.html | 4 +- .../artemis/download/commit-report-2.30.0.html | 4 +- .../artemis/download/commit-report-2.31.0.html | 4 +- .../artemis/download/commit-report-2.31.1.html | 4 +- .../artemis/download/commit-report-2.31.2.html | 4 +- .../artemis/download/commit-report-2.32.0.html | 4 +- .../artemis/download/commit-report-2.6.0.html | 4 +- .../artemis/download/commit-report-2.6.1.html | 4 +- .../artemis/download/commit-report-2.6.2.html | 4 +- .../artemis/download/commit-report-2.6.3.html | 4 +- .../artemis/download/commit-report-2.6.4.html | 4 +- .../artemis/download/commit-report-2.7.0.html | 4 +- .../artemis/download/commit-report-2.8.0.html | 4 +- .../artemis/download/commit-report-2.8.1.html | 4 +- .../artemis/download/commit-report-2.9.0.html | 4 +- .../download/styles/jquery.dataTables.min.js | 192 - .../artemis/download/styles/jquery.min.js | 2 - .../artemis/download/styles => css}/framework.css | 0 .../styles => css}/jquery.dataTables.min.css | 0 src/js/README.md | 11 ++ src/js/fontawesome-all.min.js | 1 + src/js/fontawesome-v5.0.8-all.js | 5 - src/js/fontawesome-v5.15.4-all.min.js | 5 + src/js/jquery-3.6.1.slim.min.js| 2 - src/js/jquery-3.7.1.slim.min.js| 2 + src/js/jquery.slim.min.js | 1 + 51 files changed, 118 insertions(+), 320 deletions(-) diff --git a/src/_includes/head.html b/src/_includes/head.html index 1b8c10de9..6d0fe4137 100644 --- a/src/_includes/head.html +++ b/src/_includes/head.html @@ -6,8 +6,8 @@ - - + + diff --git a/src/components/artemis/download/cherry-pick-report-2.19.1.html b/src/components/artemis/download/cherry-pick-report-2.19.1.html index 318fa8094..a244c1974 100644 --- a/src/components/artemis/download/cherry-pick-report-2.19.1.html +++ b/src/components/artemis/download/cherry-pick-report-2.19.1.html @@ -1,8 +1,8 @@ - - + + diff --git a/src/components/artemis/download/commit-report-2.10.0.html b/src/components/artemis/download/commit-report-2.10.0.html index 73162d688..b47617281 100644 --- a/src/components/artemis/download/commit-report-2.10.0.html +++ b/src/components/artemis/download/commit-report-2.10.0.html @@ -1,8 +1,8 @@ <html> <head> - <link type="text/css" charset="utf8" rel="stylesheet" href="styles/jquery.dataTables.min.css"> - <script type="text/javascript" charset="utf8" src="../../../js/jquery-3.6.1.slim.min.js"> + + diff --git a/src/components/artemis/download/commit-report-2.10.1.html b/src/componen
(activemq-artemis) branch main updated: ARTEMIS-4588 30 second pause for large msgs + federation
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 77d9f10a3d ARTEMIS-4588 30 second pause for large msgs + federation
77d9f10a3d is described below
commit 77d9f10a3dd3febff8fee417914806b8e0c2b4c2
Author: Justin Bertram
AuthorDate: Wed Feb 7 14:52:03 2024 -0600
ARTEMIS-4588 30 second pause for large msgs + federation
Large message support was added to
o.a.a.a.c.s.f.FederatedQueueConsumerImpl#onMessage via cf85d35 for
ARTEMIS-3308. The problem with that change is that when onMessage
returns o.a.a.a.c.c.i.ClientConsumerImpl#callOnMessage will eventually
call o.a.a.a.c.c.i.ClientLargeMessageImpl#discardBody which eventually
ends up in o.a.a.a.c.c.i.LargeMessageControllerImpl#popPacket waiting 30
seconds (i.e. the default readTimeout) for more packets to arrive (which
never do). This happens because the FederatedQueueConsumer short-cuts
the "normal" process by using LargeMessageControllerImpl#take.
This commit fixes that by tracking the number of bytes "taken" and then
looking at that value later when discarding the body effectively
skipping the 30 second wait.
---
.../core/client/impl/LargeMessageControllerImpl.java | 10 +-
.../integration/federation/FederatedQueueTest.java | 18 +++---
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
index 71838744ac..11857c9ee6 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
@@ -83,6 +83,8 @@ public class LargeMessageControllerImpl implements
LargeMessageController {
private long packetLastPosition = -1;
+ private long bytesTaken = 0;
+
private OutputStream outStream;
// There's no need to wait a synchronization
@@ -315,7 +317,9 @@ public class LargeMessageControllerImpl implements
LargeMessageController {
@Override
public LargeData take() throws InterruptedException {
- return largeMessageData.take();
+ LargeData largeData = largeMessageData.take();
+ bytesTaken += largeData.getChunk().length;
+ return largeData;
}
/**
@@ -1146,6 +1150,10 @@ public class LargeMessageControllerImpl implements
LargeMessageController {
}
private void checkForPacket(final long index) {
+ if (totalSize == bytesTaken) {
+ return;
+ }
+
if (outStream != null) {
throw new IllegalAccessError("Can't read the messageBody after
setting outputStream");
}
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedQueueTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedQueueTest.java
index 598717346e..5a7b91099b 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedQueueTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/federation/FederatedQueueTest.java
@@ -304,6 +304,15 @@ public class FederatedQueueTest extends FederatedTestBase {
@Test
public void testWithLargeMessage() throws Exception {
+ internalTestWithLargeMessages(1);
+ }
+
+ @Test
+ public void testWithMultipleLargeMessages() throws Exception {
+ internalTestWithLargeMessages(5);
+ }
+
+ private void internalTestWithLargeMessages(int messageNumber) throws
Exception {
String queueName = getName();
FederationConfiguration federationConfiguration =
FederatedTestUtil.createQueueUpstreamFederationConfiguration("server1",
queueName);
@@ -319,14 +328,18 @@ public class FederatedQueueTest extends FederatedTestBase
{
Session session1 = connection1.createSession();
Queue queue1 = session1.createQueue(queueName);
MessageProducer producer = session1.createProducer(queue1);
- producer.send(session1.createTextMessage(payload));
+ for (int i = 0; i < messageNumber; i++) {
+producer.send(session1.createTextMessage(payload));
+ }
connection0.start();
Session session0 = connection0.createSession();
Queue queue0 = session0.createQueue(queueName);
MessageConsumer consumer0 = session0.createConsumer(queue0);
- assertNotNull(consumer0.receive(6));
+
(activemq-artemis) branch main updated: NO-JIRA fix STOMP doc formatting
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 311e9382a2 NO-JIRA fix STOMP doc formatting 311e9382a2 is described below commit 311e9382a28100afe97fb81b377332a337a9c50c Author: Justin Bertram AuthorDate: Thu Feb 8 11:28:10 2024 -0600 NO-JIRA fix STOMP doc formatting --- docs/user-manual/stomp.adoc | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/docs/user-manual/stomp.adoc b/docs/user-manual/stomp.adoc index 7dcda48822..706c428a9b 100644 --- a/docs/user-manual/stomp.adoc +++ b/docs/user-manual/stomp.adoc @@ -46,15 +46,13 @@ Follow xref:logging.adoc#configuring-a-specific-level-for-a-logger[these steps] The STOMP specification is intentionally ambiguous about message routing semantics. When providing an overview of the protocol the STOMP 1.2 specification https://stomp.github.io/stomp-specification-1.2.html#Protocol_Overview[says]: - + A STOMP server is modelled as a set of destinations to which messages can be sent. -The STOMP protocol treats destinations as opaque string and their syntax is -server implementation specific. Additionally STOMP does not define what the -delivery semantics of destinations should be. The delivery, or -"message exchange", semantics of destinations can vary from server to server and -even from destination to destination. This allows servers to be creative with the -semantics that they can support with STOMP. - +The STOMP protocol treats destinations as opaque string and their syntax is server implementation specific. +Additionally STOMP does not define what the delivery semantics of destinations should be. +The delivery, or "message exchange", semantics of destinations can vary from server to server and even from destination to destination. +This allows servers to be creative with the semantics that they can support with STOMP. + Therefore, there are a handful of different ways to specify which semantics are desired both on the client-side and broker-side.
(activemq-artemis) branch main updated: NO-JIRA proposed log4j commented out log configuration for testing
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 460faf50fd NO-JIRA proposed log4j commented out log configuration for
testing
460faf50fd is described below
commit 460faf50fdcf1ac8a1e6ecf08aa4627facba75f4
Author: Clebert Suconic
AuthorDate: Wed Feb 7 16:16:19 2024 -0500
NO-JIRA proposed log4j commented out log configuration for testing
I have to keep looking how to do this every time I need it.
I just wanted to proposed a commented out section for next time I need this
again.
---
tests/config/log4j2-tests-config.properties | 9 +
1 file changed, 9 insertions(+)
diff --git a/tests/config/log4j2-tests-config.properties
b/tests/config/log4j2-tests-config.properties
index ea08f9d741..be88f1b87d 100644
--- a/tests/config/log4j2-tests-config.properties
+++ b/tests/config/log4j2-tests-config.properties
@@ -15,6 +15,8 @@
# Log4J 2 configuration used in tests.
rootLogger = INFO, Console
+# replace rootLogger by the following line if you want File output on your
logging
+# rootLogger = INFO, Console, File
logger.activemq.name=org.apache.activemq
logger.activemq.level=INFO
@@ -37,3 +39,10 @@ appender.console.type=Console
appender.console.name=Console
appender.console.layout.type=PatternLayout
appender.console.layout.pattern=[%t] %d{HH:mm:ss,SSS} %-5level [%logger] %msg%n
+
+# appender.file.type=File
+# appender.file.name=File
+# appender.file.fileName=target/test-debug.log
+# appender.file.layout.type=PatternLayout
+# appender.file.layout.pattern=%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n
+# appender.file.append=true
(activemq-artemis) branch main updated: ARTEMIS-4640: move os-maven-plugin extension into a profile, fix artemis-commons reproducibility
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new cdd341a1e8 ARTEMIS-4640: move os-maven-plugin extension into a profile, fix artemis-commons reproducibility cdd341a1e8 is described below commit cdd341a1e86dc2fa066e6b6ff6926b930857608f Author: Robbie Gemmell AuthorDate: Wed Feb 7 15:29:08 2024 + ARTEMIS-4640: move os-maven-plugin extension into a profile, fix artemis-commons reproducibility --- docs/hacking-guide/_building.adoc | 10 +- pom.xml | 31 ++- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/docs/hacking-guide/_building.adoc b/docs/hacking-guide/_building.adoc index e73d301bbd..40c2b3c21a 100644 --- a/docs/hacking-guide/_building.adoc +++ b/docs/hacking-guide/_building.adoc @@ -48,9 +48,17 @@ Generating the user manual's PDF adds almost a minute to the build so this can b == Offline +Maven dependency:go-offline can be used to download various things the build needs. This necessitates some properties the build doesnt normally need set, so to make this work a helper profile called `go-offline` exists to have the os-maven-plugin set these properties based on the current environment. To run these together, do: [,console] -$ mvn dependency:go-offline +$ mvn dependency:go-offline -Pgo-offline +$ mvn -o ... + + +Alternatively you can simply specify the needed properties directly, based on your environment preference. For example, on a Linux x86-64 environment you could run: +[,console] + +$ mvn dependency:go-offline -Dos.detected.name=linux -Dos.detected.arch=x86_64 -Dos.detected.classifier=linux-x86_64 $ mvn -o ... diff --git a/pom.xml b/pom.xml index 329ccb5531..4bcf1cd70e 100644 --- a/pom.xml +++ b/pom.xml @@ -1576,18 +1576,31 @@ + + + go-offline + + + + kr.motd.maven + os-maven-plugin + 1.7.1 + true + + +initialize + + detect + + + + + + + - - - -kr.motd.maven -os-maven-plugin -1.7.1 - - -
(activemq-artemis) branch main updated: NO-JIRA small doc clarification
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new b158a892c9 NO-JIRA small doc clarification b158a892c9 is described below commit b158a892c9301c6b292d2a02128a30738ae1cca2 Author: Justin Bertram AuthorDate: Wed Feb 7 08:20:07 2024 -0600 NO-JIRA small doc clarification --- docs/user-manual/using-server.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/using-server.adoc b/docs/user-manual/using-server.adoc index 60737a9a16..0af1750fc3 100644 --- a/docs/user-manual/using-server.adoc +++ b/docs/user-manual/using-server.adoc @@ -459,7 +459,7 @@ NOTE: the environment variable `JAVA_ARGS_APPEND` can be used to append or overr === Adding Runtime Dependencies -Runtime dependencies like diverts, transformers, broker plugins, JDBC drivers, password decoders, etc. must be accessible by the broker at runtime. +Runtime dependencies like transformers, broker plugins, JDBC drivers, password decoders, etc. must be accessible by the broker at runtime. Package the dependency in a jar, and put it on the broker's classpath. This can be done by placing the jar file in the `lib` directory of the broker distribution itself, by placing the jar file in the `lib` directory of the broker instance,
(activemq-artemis) branch main updated: ARTEMIS-4636 upgrade OpenWebBeans to 2.0.27
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new d418a5c00e ARTEMIS-4636 upgrade OpenWebBeans to 2.0.27 d418a5c00e is described below commit d418a5c00ed23f0b6a1cb20543a4632236158c18 Author: Justin Bertram AuthorDate: Mon Feb 5 14:20:49 2024 -0600 ARTEMIS-4636 upgrade OpenWebBeans to 2.0.27 --- pom.xml | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ecec5c1509..329ccb5531 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ 2.3.3 2.4.8.Final 2.1.0.Final - 1.7.0 + 2.0.27 1.8.0.Final 2.9.0 0.8.11 @@ -2081,6 +2081,17 @@ + + +org.apache.openwebbeans +maven + + + regex + [4]\..* + + +
(activemq-artemis) branch main updated: ARTEMIS-4635 upgrade Arquillian & Weld dependencies
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 62432ee323 ARTEMIS-4635 upgrade Arquillian & Weld dependencies 62432ee323 is described below commit 62432ee32397837488486a7a1891f5e6152d8789 Author: Justin Bertram AuthorDate: Mon Feb 5 14:04:20 2024 -0600 ARTEMIS-4635 upgrade Arquillian & Weld dependencies --- pom.xml | 18 +++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 9a4a4c0e7d..ecec5c1509 100644 --- a/pom.xml +++ b/pom.xml @@ -156,10 +156,10 @@ 1.3.3 2.1.6 2.3.3 - 2.4.0.Final - 2.0.0.Beta3 + 2.4.8.Final + 2.1.0.Final 1.7.0 - 1.1.11.Final + 1.8.0.Final 2.9.0 0.8.11 0.8.11 @@ -2069,6 +2069,18 @@ + + +org.jboss.arquillian.container +arquillian-weld-embedded +maven + + + regex + [34]\..* + + +
(activemq-artemis) branch main updated: ARTEMIS-4634 upgrade Maven Plugin Annotations to 3.11.0
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 5f0902cfe9 ARTEMIS-4634 upgrade Maven Plugin Annotations to 3.11.0 5f0902cfe9 is described below commit 5f0902cfe94a0fb8527e1c8a01e47ef598b5a282 Author: Justin Bertram AuthorDate: Mon Feb 5 13:51:29 2024 -0600 ARTEMIS-4634 upgrade Maven Plugin Annotations to 3.11.0 --- artemis-maven-plugin/pom.xml | 1 - pom.xml | 4 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/artemis-maven-plugin/pom.xml b/artemis-maven-plugin/pom.xml index 0257cd41b3..97879f3f31 100644 --- a/artemis-maven-plugin/pom.xml +++ b/artemis-maven-plugin/pom.xml @@ -87,7 +87,6 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.6.4 provided diff --git a/pom.xml b/pom.xml index a15400a527..9a4a4c0e7d 100644 --- a/pom.xml +++ b/pom.xml @@ -123,6 +123,10 @@ is resolved and a new Apache parent is released then we can get rid of this. --> 3.4.1 + + 3.11.0 + 2.2.4 2.3.9
(activemq-artemis) branch main updated: ARTEMIS-4633 upgrade Apache HTTP Core to 4.4.16
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 983bb71ad0 ARTEMIS-4633 upgrade Apache HTTP Core to 4.4.16 983bb71ad0 is described below commit 983bb71ad093a25e1364118cc1c1e27b098fcd92 Author: Justin Bertram AuthorDate: Mon Feb 5 13:41:44 2024 -0600 ARTEMIS-4633 upgrade Apache HTTP Core to 4.4.16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index feaf10b8b4..a15400a527 100644 --- a/pom.xml +++ b/pom.xml @@ -170,7 +170,7 @@ 1.19.4 4.17.0 3.0.0 - 4.4.13 + 4.4.16 4.5.14
(activemq-artemis) branch main updated (e3ce9afbb9 -> a17037bc9e)
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git from e3ce9afbb9 ARTEMIS-4631 upgrade Spring to 5.3.31 add a17037bc9e ARTEMIS-4632 upgrade Apache HTTP client to 4.5.14 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(activemq-artemis) branch main updated (347f9d7aed -> e3ce9afbb9)
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git from 347f9d7aed This closes #4387 add e3ce9afbb9 ARTEMIS-4631 upgrade Spring to 5.3.31 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(activemq-artemis) branch main updated: ARTEMIS-4187 made SizeAware attributes consistent
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 89c3a627e9 ARTEMIS-4187 made SizeAware attributes consistent
new 347f9d7aed This closes #4387
89c3a627e9 is described below
commit 89c3a627e9ca2b1ef48a6411d372c32f90a6f9ed
Author: Maverick19841972
AuthorDate: Mon Mar 6 17:31:29 2023 +0100
ARTEMIS-4187 made SizeAware attributes consistent
---
.../activemq/artemis/utils/SizeAwareMetric.java| 117 ++---
.../artemis/utils/SizeAwareMetricTest.java | 68 ++--
.../core/paging/impl/PagingManagerImpl.java| 2 -
.../artemis/core/paging/impl/PagingStoreImpl.java | 3 -
4 files changed, 93 insertions(+), 97 deletions(-)
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SizeAwareMetric.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SizeAwareMetric.java
index 45a1a9115a..1518c8b54e 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SizeAwareMetric.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SizeAwareMetric.java
@@ -42,18 +42,14 @@ public class SizeAwareMetric {
private static final AtomicIntegerFieldUpdater flagUpdater
= AtomicIntegerFieldUpdater.newUpdater(SizeAwareMetric.class, "flag");
private volatile int flag = NOT_USED;
- private long maxElements;
+ private long maxElements = -1; // disabled by default
private long lowerMarkElements;
- private long maxSize;
+ private long maxSize = -1; // disabled by default
private long lowerMarkSize;
- private boolean sizeEnabled = false;
-
- private boolean elementsEnabled = false;
-
private AddCallback onSizeCallback;
private Runnable overCallback;
@@ -62,8 +58,6 @@ public class SizeAwareMetric {
/** To be used in a case where we just measure elements */
public SizeAwareMetric() {
- this.sizeEnabled = false;
- this.elementsEnabled = false;
}
@@ -78,8 +72,6 @@ public class SizeAwareMetric {
this.lowerMarkElements = lowerMarkElements;
this.maxSize = maxSize;
this.lowerMarkSize = lowerMarkSize;
- this.sizeEnabled = maxSize >= 0;
- this.elementsEnabled = maxElements >= 0;
}
public boolean isOver() {
@@ -99,12 +91,7 @@ public class SizeAwareMetric {
}
public boolean isElementsEnabled() {
- return elementsEnabled;
- }
-
- public SizeAwareMetric setElementsEnabled(boolean elementsEnabled) {
- this.elementsEnabled = elementsEnabled;
- return this;
+ return maxElements >= 0;
}
public long getElements() {
@@ -112,12 +99,7 @@ public class SizeAwareMetric {
}
public boolean isSizeEnabled() {
- return sizeEnabled;
- }
-
- public SizeAwareMetric setSizeEnabled(boolean sizeEnabled) {
- this.sizeEnabled = sizeEnabled;
- return this;
+ return maxSize >= 0;
}
public SizeAwareMetric setOnSizeCallback(AddCallback onSize) {
@@ -214,56 +196,69 @@ public class SizeAwareMetric {
}
private void checkUnder(long currentElements, long currentSize) {
- if (sizeEnabled) {
- if (currentSize <= lowerMarkSize && changeFlag(OVER_SIZE,
PENDING_FREE)) {
-// checking if we need to switch from OVER_SIZE to OVER_ELEMENTS,
to avoid calling under needless
-if (!(elementsEnabled && currentElements >= maxElements &&
changeFlag(PENDING_FREE, OVER_ELEMENTS))) {
- try {
- under();
- } finally {
- changeFlag(PENDING_FREE, FREE);
- }
-}
-return; // we must return now as we already checked for the
elements portion
+ if (isUnderSize(currentSize) && changeFlag(OVER_SIZE, PENDING_FREE)) {
+ if (isOverElements(currentElements) && changeFlag(PENDING_FREE,
OVER_ELEMENTS)) {
+logger.debug("Switch from OVER_SIZE to OVER_ELEMENTS
[currentSize={}, currentElements={}, lowerMarkSize={}, maxElements={}]",
+currentSize, currentElements, lowerMarkSize, maxElements);
+return;
+ }
+
+ try {
+logger.debug("UnderSize [currentSize={}, lowerMarkSize={}]",
currentSize, lowerMarkSize);
+under();
+ } finally {
+changeFlag(PENDING_FREE, FREE);
}
}
- if (elementsEnabled) {
- if (currentElements <= lowerMarkElements && changeFlag(OVER_ELEMENTS,
PENDING_FREE)) {
-// checking if we need to switch from OVER_ELEMENTS to OVER_SIZE,
to avoid calling under needless
-if (!(sizeEnabled && currentSize >= maxSize &&
changeFlag(PENDING_FREE, O
(activemq-artemis) branch main updated (c4c2a9e718 -> 9bb19f6eb0)
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git from c4c2a9e718 ARTEMIS-4637 - Allow unordered xml conf elements for clusters and bridges new 968ef74cd7 Revert "ARTEMIS-4630 Fix a typo in earlier commit 7ac6f4e99cc8349b378b4ae9d9ecc0970ac5b2b4" new 9bb19f6eb0 Revert "ARTEMIS-4630 Validate if the pid is really from Artemis" The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/activemq/artemis/cli/commands/bin/artemis-service| 6 +- 1 file changed, 1 insertion(+), 5 deletions(-)
(activemq-artemis) 02/02: Revert "ARTEMIS-4630 Validate if the pid is really from Artemis"
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 9bb19f6eb0a480abfb56879cfaa86c4f117c8c82
Author: Justin Bertram
AuthorDate: Tue Feb 6 11:02:55 2024 -0600
Revert "ARTEMIS-4630 Validate if the pid is really from Artemis"
This reverts commit 7ac6f4e99cc8349b378b4ae9d9ecc0970ac5b2b4.
---
.../org/apache/activemq/artemis/cli/commands/bin/artemis-service| 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
index e412647374..491f881a29 100755
---
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
+++
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
@@ -59,13 +59,9 @@ fi
status() {
if [ -f "${PID_FILE}" ] ; then
pid=`cat "${PID_FILE}"`
-pid_workdir=$ARTEMIS_INSTANCE
-if [ `command -v lsof &> /dev/null` ]; then
- pid_workdir="`lsof -a -d cwd -p ${pid} | awk '{print $9}' | tail -1`"
-if
# check to see if it's gone...
ps -p ${pid} > /dev/null
-if [ $? -eq 0 ] && [ "$pid_workdir" = "$ARTEMIS_INSTANCE" ]; then
+if [ $? -eq 0 ] ; then
return 0
else
rm "${PID_FILE}"
(activemq-artemis) 01/02: Revert "ARTEMIS-4630 Fix a typo in earlier commit 7ac6f4e99cc8349b378b4ae9d9ecc0970ac5b2b4"
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 968ef74cd7104cf0f906d268f18723be2df1ab0b
Author: Justin Bertram
AuthorDate: Tue Feb 6 11:02:45 2024 -0600
Revert "ARTEMIS-4630 Fix a typo in earlier commit
7ac6f4e99cc8349b378b4ae9d9ecc0970ac5b2b4"
This reverts commit 306b192e80e0477c837e2dbfcefe555b2bfafe51.
---
.../org/apache/activemq/artemis/cli/commands/bin/artemis-service| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
index dd15a347ae..e412647374 100755
---
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
+++
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
@@ -62,7 +62,7 @@ status() {
pid_workdir=$ARTEMIS_INSTANCE
if [ `command -v lsof &> /dev/null` ]; then
pid_workdir="`lsof -a -d cwd -p ${pid} | awk '{print $9}' | tail -1`"
-fi
+if
# check to see if it's gone...
ps -p ${pid} > /dev/null
if [ $? -eq 0 ] && [ "$pid_workdir" = "$ARTEMIS_INSTANCE" ]; then
(activemq-artemis) branch main updated: ARTEMIS-4630 Validate if the pid is really from Artemis
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 7ac6f4e99c ARTEMIS-4630 Validate if the pid is really from Artemis
7ac6f4e99c is described below
commit 7ac6f4e99cc8349b378b4ae9d9ecc0970ac5b2b4
Author: Ângelo Galvão
AuthorDate: Fri Feb 2 10:18:05 2024 -0500
ARTEMIS-4630 Validate if the pid is really from Artemis
In rare cases the status is returning 'running' to a process that is
not Artemis. It was create a extra level of verification by validating
if the running process working directory is the
same of ${ARTEMIS_INSTANCE}.
---
.../org/apache/activemq/artemis/cli/commands/bin/artemis-service| 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
index 491f881a29..e412647374 100755
---
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
+++
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
@@ -59,9 +59,13 @@ fi
status() {
if [ -f "${PID_FILE}" ] ; then
pid=`cat "${PID_FILE}"`
+pid_workdir=$ARTEMIS_INSTANCE
+if [ `command -v lsof &> /dev/null` ]; then
+ pid_workdir="`lsof -a -d cwd -p ${pid} | awk '{print $9}' | tail -1`"
+if
# check to see if it's gone...
ps -p ${pid} > /dev/null
-if [ $? -eq 0 ] ; then
+if [ $? -eq 0 ] && [ "$pid_workdir" = "$ARTEMIS_INSTANCE" ]; then
return 0
else
rm "${PID_FILE}"
(activemq-artemis) branch main updated: ARTEMIS-4629 fix core bridge docs
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new f91d7c51fd ARTEMIS-4629 fix core bridge docs f91d7c51fd is described below commit f91d7c51fd4c03ba363d8af1f7f3296442cdce53 Author: Justin Bertram AuthorDate: Fri Feb 2 11:15:16 2024 -0600 ARTEMIS-4629 fix core bridge docs This fills in the gaps for some missing parameters in the core bridge documentation as well as fixes the example so it's actually valid according to the XSD. --- .../resources/schema/artemis-configuration.xsd | 7 ++-- docs/user-manual/core-bridges.adoc | 47 ++ 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/artemis-server/src/main/resources/schema/artemis-configuration.xsd b/artemis-server/src/main/resources/schema/artemis-configuration.xsd index 9f6a784f14..f4d9d1d493 100644 --- a/artemis-server/src/main/resources/schema/artemis-configuration.xsd +++ b/artemis-server/src/main/resources/schema/artemis-configuration.xsd @@ -1327,8 +1327,7 @@ - Any message larger than this size (in bytes) is considered a large message (to be sent in - chunks). + Any message larger than this size (in bytes) is considered a large message (to be sent in chunks). Supports byte notation like "K", "Mb", "MiB", "GB", etc. @@ -1447,8 +1446,8 @@ - Upon reconnection this configures the number of time the same node on the topology will be retried - before resetting the server locator and using the initial connectors + configures the number of times reconnection attempts will be made to the same node on the topology + before reverting back to the initial connector(s) diff --git a/docs/user-manual/core-bridges.adoc b/docs/user-manual/core-bridges.adoc index 4fbbefefb7..f480bfe44b 100644 --- a/docs/user-manual/core-bridges.adoc +++ b/docs/user-manual/core-bridges.adoc @@ -30,27 +30,33 @@ To provide the same guarantee using a JMS bridge you would have to use XA which == Configuring Core Bridges Bridges are configured in `broker.xml`. -Let's kick off with an example (this is actually from the bridge example): +Let's kick off with an example: [,xml] sausage-factory mincing-machine + true org.apache.activemq.artemis.jms.example.HatColourChangeTransformer - 1000 - true + 102400 + 3 + 6 + 2000 1.0 + 2000 -1 -1 false true 1000 + 1048576 foouser foopassword + 10 PASS 1 @@ -79,6 +85,11 @@ forwarding-address:: This is the address on the target server that the message will be forwarded to. If a forwarding address is not specified, then the original address of the message will be retained. +ha:: +This optional parameter determines whether or not this bridge should support high availability. +True means it will connect to any available server in a cluster and support failover. +The default value is `false`. + filter-string:: An optional filter string can be supplied. If specified then only messages which match the filter expression specified in the filter string will be forwarded. @@ -89,10 +100,20 @@ An _optional_ transformer can be specified. This gives you the opportunity to transform the message's header or body before forwarding it. See the xref:transformers.adoc#transformers[transformer chapter] for more details about transformer-specific configuration. -ha:: -This optional parameter determines whether or not this bridge should support high availability. -True means it will connect to any available server in a cluster and support failover. -The default value is `false`. +min-large-message-size:: +Any message larger than this size (in bytes) is considered a large message (to be sent in chunks). +Supports byte notation like "K", "Mb", "MiB", "GB", etc. +Default is `102400` (i.e. 100KiB). + +check-period:: +Sets the period (in milliseconds) used to check if the bridge client has failed to receive pings from the server. +Use `-1` to disable this check. +Default is `3`. + +connection-ttl:: +How long (in milliseconds) the remote server will keep the connection alive in the absence of any data arriving from the bridge. +This should be greater than the `check-period`. +Default is `6`. retry-interval:: This optional parameter determines the period in milliseconds between subsequent reconnection attempts, if the connection to the target server has failed. @@ -109,
(activemq-artemis-examples) branch development updated: ARTEMIS-4608 upgrade Derby to 10.15.2.0 (#5)
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch development
in repository https://gitbox.apache.org/repos/asf/activemq-artemis-examples.git
The following commit(s) were added to refs/heads/development by this push:
new 564ac5e ARTEMIS-4608 upgrade Derby to 10.15.2.0 (#5)
564ac5e is described below
commit 564ac5e2d80f372c8fd5e6b147e6eee0f92467b0
Author: Justin Bertram
AuthorDate: Thu Feb 1 11:01:54 2024 -0600
ARTEMIS-4608 upgrade Derby to 10.15.2.0 (#5)
---
examples/features/standard/database/pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/examples/features/standard/database/pom.xml
b/examples/features/standard/database/pom.xml
index 4ab8d90..ba06676 100644
--- a/examples/features/standard/database/pom.xml
+++ b/examples/features/standard/database/pom.xml
@@ -59,6 +59,8 @@ under the License.
org.apache.derby:derby:${apache.derby.version}
+
org.apache.derby:derbytools:${apache.derby.version}
+
org.apache.derby:derbyshared:${apache.derby.version}
--jdbc
(activemq-artemis) branch main updated: ARTEMIS-4624 upgrade TestContainers to 1.19.4
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 3f65f74753 ARTEMIS-4624 upgrade TestContainers to 1.19.4 3f65f74753 is described below commit 3f65f747531df97850a022c4f0c6a7a449ad37fe Author: Justin Bertram AuthorDate: Wed Jan 31 10:18:04 2024 -0600 ARTEMIS-4624 upgrade TestContainers to 1.19.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d0a2424b8..bfcc71ecf9 100644 --- a/pom.xml +++ b/pom.xml @@ -168,7 +168,7 @@ 2.3.3 1.2.5 42.7.1 - 1.17.6 + 1.19.4 4.17.0 3.0.0 4.4.13
(activemq-artemis) branch main updated: ARTEMIS-4623 upgrade SLF4J to 2.0.11
This is an automated email from the ASF dual-hosted git repository. jbertram pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 7454b4d284 ARTEMIS-4623 upgrade SLF4J to 2.0.11 7454b4d284 is described below commit 7454b4d2842b2431dc93b1a4f325a167896958ff Author: Justin Bertram AuthorDate: Wed Jan 31 10:16:14 2024 -0600 ARTEMIS-4623 upgrade SLF4J to 2.0.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b218eafa6e..8d0a2424b8 100644 --- a/pom.xml +++ b/pom.xml @@ -131,7 +131,7 @@ 2.0.61.Final 0.34.1 1.0.0-M19 - 2.0.9 + 2.0.11 2.22.1 1.10.0 1.2.21
