Commit Graph

1235 Commits

Author SHA1 Message Date
Jean-Baptiste Onofré c44bf3c5f7 Fix OfflineDurableSubscriberTimeoutTest on some machine (including Jenkins)
(cherry picked from commit ffab5274a4)
2022-04-06 07:45:03 +02:00
Christopher L. Shannon aa10747e94 AMQ-8550 - Check for null keystore/truststore passwords
Inside ActiveMQSslConnectionFactory the passwords should be checked for
null so a NPE isn't thrown. Null will be passed to the factories instead
and the keystore/truststore factories will try and load the keystores
using null for the password which may or may not work depending on the
implementation and if password is set.

(cherry picked from commit b93d58259c)
2022-04-05 13:41:54 -04:00
Jean-Baptiste Onofré bd08484445 [maven-release-plugin] prepare for next development iteration 2022-03-09 21:47:58 +01:00
Jean-Baptiste Onofré 1f3ccad9bb [maven-release-plugin] prepare release activemq-5.17.0 2022-03-09 21:47:47 +01:00
Jean-Baptiste Onofré a9cb53bd38 Cancel 5.17.0 release 2022-03-09 21:42:04 +01:00
Christopher L. Shannon (cshannon) 482a5e819d AMQ-8530 - Update to geronimo-annotation_1.3_spec
(cherry picked from commit 3d06efe93d)
2022-03-09 12:54:31 -05:00
Christopher L. Shannon f25ff1bca2 AMQ-8528: Fix test failures in integration module
-DurableFiveBrokerNetworkBridgeTest: Fix refactoring mistake
-SpringTest: Fix Spring xml files
-BrokerRedeliveryTest: Fix after sendDuplicateFromStoreToDLQ default
changed to false
-AMQ4952Test: Fix after sendDuplicateFromStoreToDLQ default
changed to false
-AMQ3537Test: Add missing package to SERIALIZABLE_PACKAGES
-OfflineDurableSubscriberTimeoutTest: Fix after log4j2 update
-JDBCConcurrentDLQTest: Fix after log4j2 update

(cherry picked from commit 32e72b0879)
2022-03-08 13:33:37 -05:00
Christopher L. Shannon 15a2f3de2c NO-JIRA: Activate quick-tests by default (#792)
(cherry picked from commit c4d9d70987)
2022-03-08 13:23:41 -05:00
Jean-Baptiste Onofré 2582384511 [maven-release-plugin] prepare for next development iteration 2022-03-07 15:41:59 +01:00
Jean-Baptiste Onofré 8ad238bb7d [maven-release-plugin] prepare release activemq-5.17.0 2022-03-07 15:41:49 +01:00
Christopher L. Shannon (cshannon) b31cc6f2cb AMQ-7309: Compilation fixes after revert of JMS 2.0 api change 2022-03-03 16:58:17 -05:00
Christopher L. Shannon (cshannon) da9e5276f1 AMQ-8520: Log4j2 test fixes
Also fixes Log4jConfigView

(cherry picked from commit ae30dce4e2)
2022-03-03 16:42:22 -05:00
Matt Pavlovich 4d662648be [AMQ-8520] WIP: Convert activemq-unit-tests to log4j2
(cherry picked from commit 7ec5254bb5)
2022-03-03 16:42:20 -05:00
Christopher L. Shannon (cshannon) efe3f5b7d4 AMQ-8520: Re-enable all modules to compile and build by default
Updates the modules part of the previous full.test profile to always
build but skip running tests by default.

Also fixed miss dependency updates including log4j and jetty

(cherry picked from commit f240cb5806)
2022-03-03 16:41:38 -05:00
Christopher L. Shannon (cshannon) 8a4c928806 Revert "[AMQ-7309] Update to jakarta.jms/jakarta.jms-api:2.0.3 (#682)"
This reverts commit 67256c61b1.
2022-03-01 10:25:01 -05:00
Jean-Baptiste Onofré e597017200
Merge pull request #662 from jbonofre/AMQ-7426
[AMQ-7426] Upgrade to log4j2
2022-02-27 13:23:53 +01:00
Matt Pavlovich 094dbc89f3
[AMQ-8515] FailoverTransport should handle MaxFrameSizeExceededException (#785) 2022-02-25 19:46:45 -06:00
Matt Pavlovich 9956dd602a
[AMQ-8440] Set sendDuplicateFromStoreToDLQ to 'false' by default (#773) 2022-02-24 08:45:35 -06:00
jbonofre 472dcf8497 [AMQ-7426] Upgrade to log4j2 2022-02-24 15:20:51 +01:00
Christopher L. Shannon 856d54c7bc
Merge pull request #762 from mattrpav/AMQ-8443-tests
[AMQ-8443] Add unit test
2022-02-09 10:48:04 -05:00
Matt Pavlovich 09458713aa [AMQ-8443] Add unit test 2022-02-09 08:50:24 -06:00
Christopher L. Shannon a7109bc025
Merge pull request #761 from mattrpav/AMQ-8397-tests
[AMQ-8397] Add unit tests for AMQ-8397
2022-02-09 06:33:52 -05:00
Matt Pavlovich 9d8ee0d3b7 [AMQ-8397] Add unit tests for AMQ-8397 2022-02-08 22:19:57 -06:00
Matt Pavlovich 2a9f777aab [AMQ-8413] NetworkConnectore remote user and pass unit test 2022-02-07 08:22:27 -06:00
Christopher L. Shannon fb036974ca
Merge pull request #758 from mattrpav/AMQ-8053b
[AMQ-8053] UserIDBroker unit tests
2022-02-07 08:28:08 -05:00
Christopher L. Shannon (cshannon) 26a3c55833 AMQ-8412 - Add wireformat negotiation test for maxFrameSizeEnabled
Verify that maxFrameSizeEnabled being configured on the client or the
server is not negotiated and won't affect the other
2022-02-07 08:03:06 -05:00
Matt Pavlovich 67a2edbf0d [AMQ-8412] Update client-side maxFrameSize handling to be more symetrical with server-side
- Handle in the OpenWireFormat class
 - Add unit tests to confirm
 - Verify compression is accounted for
 - Verify the ability to disable using wireFormat.maxFrameSizeEnabled=false
 - [cshannon] Reworked max frame size test case to add in all transports and all client/server cases
2022-02-06 17:45:11 -06:00
Matt Pavlovich 49f1b2c903 [AMQ-8053] UserIDBroker unit tests 2022-02-06 12:46:44 -06:00
Endre Stølsvik 9167a79b79 StatisticsBrokerPlugin: Add feat: request destination firstMessageTimestamp
Adding a feature (STATS_FIRST_MESSAGE_TIMESTAMP) to the
StatisticsBrokerPlugin's destination-statistics for getting the
timestamp of the first message in the destination(s) being requested: If
you on the query-message set the property
StatisticsBroker.STATS_FIRST_MESSAGE_TIMESTAMP to anything (e.g. boolean
true), a long value "firstMessageTimestamp" will be added to the
statistics reply message(s). Since the reply message has JMSTimestamp
set, which is the broker's now-timestamp, you may also on the query side
calculate the age of the first message in milliseconds. The key name was
chosen since that is the name of the corresponding feature in Artemis.

This extension of the existing feature is implemented to be as
non-intrusive as possible, adding very little runtime cost if not
requested. It also seems like the runtime cost for enabling this
feature, thus finding and adding the firstMessageTimestamp, is small.

While at it, also slightly improving an existing feature
(STATS_DENOTE_END_LIST) where a reply to a destination query can be
"null terminated": After sending the relevant replies, the
StatisticsBroker also sends an empty message. This feature is relevant
if the query is a wildcard query, thus returning multiple messages: The
empty message denotes the end of the replies. However, to activate this
feature, a somewhat complicated query destination had to be constructed.
Adopting the solution for the other StatisticsBroker feature where you
may reset the broker statistics by adding a property to the query
message, this null-termination feature now /also/ checks for the
presence of this query modifier STATS_DENOTE_END_LIST as a property.
(This property based solution was thus also adopted for the present
'firstMessageTimestamp' solution, as it was found much more intuitive).

Added tests for both the STATS_FIRST_MESSAGE_TIMESTAMP query modifier,
and the improved STATS_DENOTE_END_LIST property-based query modifier.

Had to make the Topic.doBrowse(List browseList, int max) public - the
corresponding method for Queue was already public.

Made the evaluation of whether this is a StatisticsBroker-relevant
message a microscopic bit more performant (exiting faster if not
relevant): To the initial test of whether the message is relevant, which
only checked for replyTo being set, a check for 'destination.
startsWith("ActiveMQ.Statistics")' was added. Only if so, the rest of
the evaluations kick in. Also using 'string.startsWith(..)' instead of
the verbose 'string.regionMatches(..)'.

Removed an unused import on PartitionBrokerTest.java, as IntelliJ
complained about not finding it.
2022-01-25 09:45:48 +01:00
Jean-Baptiste Onofré 3d2fb2b609
Merge pull request #707 from AlexejTimonin/sendTextMessageWithProperties-delimiter
[AMQ-8372] Allow custom delimiter when sending TextMessages via MBean
2022-01-22 17:14:03 +01:00
Jean-Baptiste Onofré ee21925c08 [AMQ-7325] Upgrade to Derby 10.15.2.0 2022-01-17 16:29:53 +01:00
Jean-Baptiste Onofré de563e76ce
Merge pull request #738 from mattrpav/AMQ-8341
[AMQ-8341] Remove FTP Blob strategy
2022-01-15 07:01:25 +01:00
Jean-Baptiste Onofré ff134fd135 [AMQ-8456] Fix unit test compilation 2022-01-12 20:36:29 +01:00
Matt Pavlovich 2e784d07be [AMQ-8341] Remove FTP Blob strategy
- Remove commons-net dependency
2022-01-12 11:05:43 -06:00
Matt Pavlovich 67256c61b1
[AMQ-7309] Update to jakarta.jms/jakarta.jms-api:2.0.3 (#682)
- API update only
 - Throw UnsupportedOperationException
 - Disable activemq-camel from build
 - Formatting fixes
 - Use geronimo-jms for osgi-related artifacts
 - Fix features.xml invalid xml header
 - Add a unit test to confirm JMS 2.0 methods for phase 1 (throw UnsupportedOperationException)
 - Add deliveryTime field to Message
 - Minor formatting fixes
2021-11-10 11:56:04 -06:00
Alexej Timonin 7c63227003 Allow custom delimiter when sending TextMessages via MBean
This enables possibility to send messages containing commas in the body
with tools such as jconsole.
Example simple text as body: body=Hello, world!
Example json as body: body={"a":"b","c":"d"}
2021-09-04 22:31:22 +02:00
Matt Pavlovich c1a2ff25c1
[AMQ-8033] Remove activemq-camel (#701)
* [AMQ-8033] Remove activemq-camel

 - Prerequisite for JMS v2.0 support

* [AMQ-8033] Remove activemq-camel

 - Prerequisite for JMS v2.0 support

* [AMQ-8033] Assembly and karaf clean-ups
2021-09-03 11:21:13 -05:00
Christopher L. Shannon (cshannon) 8b99596eeb AMQ-8349 - Ensure virtual destination consumer advisories are only
replayed to new advisory consumers and not existing
2021-08-05 09:58:37 -04:00
gtully c4d2ddfce9 AMQ-7298 - fix regression with broker redelivery plugin, fix and test relates to AMQ-8168 2021-04-16 13:12:13 +01:00
charlie-aws f8b0db2dd4 fix BrokerServiceTest by replacing powermock
fix BrokerServiceTest by replacing powermock
2021-03-29 10:30:47 -07:00
Jean-Baptiste Onofré 25b639c464
Merge pull request #593 from jbonofre/AMQ-7502
[AMQ-7502] Remove leveldb
2021-03-29 18:00:36 +02:00
charlie-aws 30986e372c AMQ-8189 add wait time to CachedLDAPAuthorizationModuleTest 2021-03-25 13:05:37 -07:00
jbonofre 52a2bd446a [AMQ-7502] Remove leveldb 2021-03-25 18:54:53 +01:00
Jean-Baptiste Onofré fc0999cc87
Merge pull request #639 from charlie-cyf/AMQ8190
AMQ-8190 add wait time & shrink duration for CI test run
2021-03-25 12:51:22 +01:00
Jonathan Gallimore edd0515d90 AMQ-8201 Forward commit commands for local transactions as well as XA transactions during ACK compaction 2021-03-25 11:02:53 +00:00
Charlie Chen 6691e23e48 AMQ-8190 add wait time & shrink duration for CI test run 2021-03-24 20:35:07 -07:00
gtully 09389d1ef3 AMQ-8202 - fix concurrency issue on tracking stores in mKahaDB, exposed by virtual topic concurrentSend 2021-03-24 15:55:44 +00:00
kimmking b6ab868f94
ClientIdFilterDispatchPolicy dispatches messages in a topic to a given client. Then the message with a PTP_CLIENTID property, can be received by a mqtt client with the same clientId. (#238) 2021-03-22 16:22:01 +01:00
Christopher L. Shannon (cshannon) 2cf3decd8e AMQ-8184 - Re-enable NIO tests
Re-enable the nio transport tests in activemq-unit-tests by default to
catch transport errors. Also fix broken tests
2021-03-11 11:16:29 -05:00
Christopher L. Shannon (cshannon) 944ca6c7e1 AMQ-8183 - prevent infinite loop when maxFrameSize is exceeded
This makes sure the nio transport thread properly terminates if
maxFrameSize is exceeded with OpenWire to prevent an infinite loop that
uses up all the cpu
2021-03-11 09:59:36 -05:00