9983 Commits

Author SHA1 Message Date
Timothy Bish
0e30927836 AMQ-6909 Update Qpid JMS, proton-j and Netty to latest.
Use latest releases of AMQP deps
(cherry picked from commit b29d2ea34275ce5cb4d2653ff1edda9dad454763)
2018-05-08 17:45:38 -04:00
Claus Ibsen
2eafc39171 AMQ-6957: Upgrade to Camel 2.19.5 2018-05-05 08:10:00 +02:00
Christopher L. Shannon (cshannon)
79fae8c00b Revert "AMQ-6947 - Make sure counters are updated correct on message drop"
This reverts commit 1fe096cb2a3ec03dbf5a7aab05c0960f8c739339.
2018-04-18 12:35:10 -04:00
Christopher L. Shannon (cshannon)
86fbf957e9 Revert "AMQ-6947 - Update Queue metrics on expiration"
This reverts commit bca0af4133a6e226783f8e953f1abe7d4e165743.
2018-04-18 12:35:01 -04:00
Christopher L. Shannon (cshannon)
bca0af4133 AMQ-6947 - Update Queue metrics on expiration
The updated dropMessage method only decrements the destination metrics
if a message is removed from the pagedInMessages list to prevent
duplicate updates.  There is also a case where we still need to update
metrics if the message never makes it into the pagedInMessages list in
the first place and that is on expiration so this patch fixes that. A
couple existing tests found this issue.

(cherry picked from commit 6e468b4540754cad5cd30de373cadc026c998669)
2018-04-18 09:06:31 -04:00
Christopher L. Shannon (cshannon)
1fe096cb2a AMQ-6947 - Make sure counters are updated correct on message drop
Only update metrics counters when message is removed from the
pagedInMessages list which is important to check in case of duplicates

(cherry picked from commit 021c82859cf4361eb31b21fdbac17655ae9e368d)
2018-04-17 08:25:56 -04:00
Alvin Lin
0036084af6 AMQ-6930 provide options to allow stdout/stderr of activemq process to be redirect to a file using append mode
(cherry picked from commit f3a8e882068803a3cdab338d3544b27a7808e0cc)
2018-04-10 16:52:47 -06:00
Alvin Lin
929483906b AMQ-6930 add test case
(cherry picked from commit 6bb56decf881328f5595692ca17c1899f7f86a7b)
2018-04-10 16:26:09 -06:00
Christopher L. Shannon (cshannon)
9683ae3f5d AMQ-6940 - test fix for AMQ6477 test
Need to remove the portion of the test that looks at the dispatched list
for TopicSubscription as that class no longer tracks message references

(cherry picked from commit 84126d8a7a7eb9faf44bef687dcf647e84173f22)
2018-03-30 06:35:52 -04:00
Christopher L. Shannon (cshannon)
a0a240372f AMQ-6940 - fix compilation attempt 2 2018-03-30 06:31:04 -04:00
Christopher L. Shannon (cshannon)
9346fb3638 AMQ-6940 - Fix compilation 2018-03-30 06:29:25 -04:00
Christopher L. Shannon (cshannon)
21a594c8e8 AMQ-6940 - Add flag to disable TopicSubscription in flight stats
To save memory usage in some use cases add a new flag to PolicyEntry
called useTopicSubscriptionInflightStats to allow disabling the
inflight stats

(cherry picked from commit 65b0f2ad0d48845ad54681ac0eff832de122e2a9)
2018-03-29 13:26:13 -04:00
Christopher L. Shannon (cshannon)
cae382063e AMQ-6940 - Reduce memory footprint for inflight statistics
For the TopicSubscription case we can reduce the inflight statistics
memory footprint by not storing the entire message reference for in
flight messages and instead just a subset of the information needed.

(cherry picked from commit f69fd6f0020290752a7424479821c22d94f9b8b7)
2018-03-29 09:02:20 -04:00
Christopher L. Shannon (cshannon)
d36412314f AMQ-6935 - Update Jolokia to 1.5.0
(cherry picked from commit d97bbe5b5d7c970d39bd1cf6ea5472c6e5cc767e)
2018-03-22 14:22:20 -04:00
Christopher L. Shannon (cshannon)
e090425891 AMQ-6934 - Updating Jackson to 2.9.4
(cherry picked from commit d195b01f3b4d57c230e871e126b30aae747b2ae6)
2018-03-22 14:09:31 -04:00
Christopher L. Shannon (cshannon)
2ca46c561b AMQ-6924 - Fix StoreDurableSubscriberCursor non-persistent message add
StoreDurableSubscriberCursor now properly uses a timeout value when
attempting to add to the temporary store for non-persistent messages to
prevent an indefinite wait on free space

(cherry picked from commit 5e2adc0ed7dfe2e827bdef878f1c8cde12ff5773)
2018-03-09 07:41:38 -05:00
Timothy Bish
d6b703bcb1 AMQ-6909 Update Qpid JMS to 0.30.0 release and Proton-j to 0.26.0
Update to latest Qpid JMS and Proton-J and the matching netty version
for Qpid JMS 4.1.22.Final
(cherry picked from commit 0bb4a5c3ab43b0f10f4a255f134de5b8533eb67d)
2018-03-02 16:14:16 -05:00
Christopher L. Shannon (cshannon)
6e7f622456 AMQ-6901 - Add NPE check inside DestinationMap filter
(cherry picked from commit 703b7b151017fe117363e5598146e157bad78265)
2018-02-16 14:33:27 -05:00
Christopher L. Shannon (cshannon)
3c2d5a3015 AMQ-6901 - Make sure proper policy is used to configure a destination
When multiple wildcard policies exist in a hierarchy it was possible for
the wrong policy to be selected when configuring a destination

(cherry picked from commit 2ce1c1352fb64ecf1d3018e2b0f7cabeba99b589)
2018-02-16 10:42:59 -05:00
Claus Ibsen
4841ff56e3 Upgrade Camel 2018-02-01 09:51:32 +01:00
Christopher L. Shannon (cshannon)
bb2db5741b [maven-release-plugin] prepare for next development iteration 2018-01-29 08:46:14 -05:00
Christopher L. Shannon (cshannon)
bd4285d3aa [maven-release-plugin] prepare release activemq-5.15.3 activemq-5.15.3 2018-01-29 08:42:12 -05:00
Christopher L. Shannon (cshannon)
46b1cba949 Revert "[no jira] add targetNamespace for karaf features"
This reverts commit 2745b914f0403094685fe7708f79e98ca6f2c524.
2018-01-29 08:32:37 -05:00
Christopher L. Shannon (cshannon)
d19ad268e7 Revert "[no jira] update targetNamespace version for karaf features"
This reverts commit a7dae7ec0a87b19aa4123f8b0c226ecd18e1506e.
2018-01-29 08:32:26 -05:00
Christopher L. Shannon (cshannon)
164312f888 NO-JIRA: Add missing license headers
(cherry picked from commit e5de25f4fc7401c4b5888bb9836eb5a6886bada2)
2018-01-29 08:12:16 -05:00
Christopher L. Shannon (cshannon)
a7ee7ab3a9 Add schemas
(cherry picked from commit 5189b4e54594793f308c75e4b357bd855887fea1)
2018-01-29 08:12:09 -05:00
Timothy Bish
4afb41afa1 AMQ-6874 Update Qpid JMS to 0.29.0 and proton-j to 0.25.0
This updates the AMQP libs Qpid JMS and Proton-J, also updates netty to
4.1.19.Final to match the version used for Qpid JMS
(cherry picked from commit a3f65e0aecfb1dbc8e78dbee336f2f74abdfe8bb)
2018-01-22 11:43:19 -05:00
gtully
d8f8ae9f92 [AMQ-6815] rework to drop the batch reference from Location such that batches are free for gc when index pages are agressively cached
(cherry picked from commit ec6fa190999160676cab900038b268b2d40a4d5c)
2018-01-11 08:07:58 -05:00
Christopher L. Shannon (cshannon)
7f75b4b9a6 AMQ-6884 - Replacing printStackTrace() with logging statement
(cherry picked from commit 4535e8f097c993364026c00ed40777c71a36a6ea)
2018-01-11 07:27:49 -05:00
Sami Nurminen
c9eb5a7251 AMQ-6327 - Remove System.out.println 2017-12-22 18:25:53 -05:00
Hadrian Zbarcea
a7dae7ec0a [no jira] update targetNamespace version for karaf features 2017-12-22 00:35:45 -05:00
Hadrian Zbarcea
2745b914f0 [no jira] add targetNamespace for karaf features 2017-12-22 00:31:02 -05:00
Łukasz Dywicki
3e9ee71062 AMQ-6861 Allow customisation of network bridge creation logic. 2017-12-20 22:17:17 -05:00
Sami Nurminen
2f1a6d3b3b AMQ-6327 - getNextScheduledTime() returns incorrect time when working with day of month 2017-12-20 21:32:32 -05:00
gtully
0464d53233 [AMQ-6847] limit the retry loop to one iteration overa all pending messages such that new additions are not replayed to avoid duplicates
(cherry picked from commit 03b19b9da4d50c3bb8985f930e93596c7d994d26)
2017-12-19 07:18:12 -05:00
gtully
eb9e50f3c9 [AMQ-6847] pause dispatch for message move to avoid redelivery with pending ack/remove/audit rollback
(cherry picked from commit 2ea5d1420bbbf90bd151e19a75e6ca33c773f1f4)
2017-12-19 07:18:01 -05:00
Carlo Dapor
b04b971685 [AMQ-6601] AMQ with master and slave broker, shutting down slave causes dead-lock. 2017-12-18 22:54:23 -05:00
Bernd
c64af87ee2 Javadoc typo fix and cleanup
This mostly fixes the url1/url2 copy and paste problem. It uses a bit more readable property syntax and introduces a single sentence (plain text) summary for class Javadoc and adds some links.
2017-12-18 21:19:19 -05:00
Hadrian Zbarcea
944b8273c0 [no jira] Fix invalid xml for broker config 2017-12-18 17:54:44 -05:00
Christopher L. Shannon (cshannon)
94aea677ac AMQ-6875 - Use the correct destination for Virtual destination consumers
when using Virtual Topics

(cherry picked from commit 56baba96c657d4e44b88955a964d6c92ff39b822)
2017-12-14 16:02:06 -05:00
Timothy Bish
c5d8a98106 AMQ-6874 Update Qpid JMS to 0.28.0 and proton-j to 0.24.0
This updates the AMQP libs Qpid JMS and Proton-J, also updates netty to
4.1.18.Final to match the version used for Qpid JMS
(cherry picked from commit d3e439378405afb699fcbfc63d9342fbb6ad77ce)
2017-12-14 12:32:49 -05:00
Timothy Bish
cd380ee3aa AMQ-6872 Use correct type casts on ApplicationProperties Map
Fix missing cast on value out of current proton release.
(cherry picked from commit 36a2871301e9e75c198294d31756b49a22a21fc8)
2017-12-08 11:41:48 -05:00
Timothy Bish
a9903148ee AMQ-6872 Use correct type casts on ApplicationProperties Map
Use the spec defined values when casting the Map from the
ApplicationProperties section.
(cherry picked from commit e7bce023de48591475781ba024104f8010a696fc)
2017-12-07 14:56:09 -05:00
Christopher L. Shannon (cshannon)
d2e49be3a8 AMQ-6871 - By default only send generic platform details
The default behavior by the OpenWire client will be to send generic
platform details to the server with a new flag to send more specific
information.

(cherry picked from commit 5fa0bbd5156f29d97dcf48fd9fdb6a0488a8df1a)
2017-12-06 08:42:12 -05:00
Christopher L. Shannon (cshannon)
1cfc9ff9a6 (AMQ-6858) - add extra precautionary check for demand subs
also remove test that intermittently fails with timing issues

(cherry picked from commit 08aa5118ffcd8dfc4ec813d799a61ef1ee4421d1)
2017-11-16 07:50:53 -05:00
Christopher L. Shannon (cshannon)
3285be60ed (AMQ-6858) - test fix
(cherry picked from commit 2e3a7f6114fae1ffb9c19ee4af2f4541fdfc238e)
2017-11-16 07:50:47 -05:00
Christopher L. Shannon (cshannon)
247243c9c1 AMQ-6858 - handle resync of network proxy durables after restart
We need to properly handle the re-addition of network proxy durables
after the brokers are restarted so removal is done properly

(cherry picked from commit 6013441a9a7c4a13f7412d6d72638de0f420e6a3)
2017-11-16 07:50:40 -05:00
Christopher L. Shannon (cshannon)
39d6321a4a AMQ-6858 - Allow configuration of the client Id token in network bridge
The client id token that is used to separate parts of a generated local
client id in a network bridge should be configurable so bridge names and
broker names can contain underscores if desired

(cherry picked from commit 3ca439cadaa8c40f506aa1ef683b36624d216254)
2017-11-16 07:50:31 -05:00
Christopher L. Shannon
97fe20a572 AMQ-6858 - reworking durable subscription propagation fix
Significantly reworking previous fix so that the client id is properly
changed when tracking network proxy subscriptions. This makes it so
removal is done properly

(cherry picked from commit 41211c78d19b545a2352584d3598346aa3705be4)
2017-11-16 07:50:19 -05:00
Christopher L. Shannon (cshannon)
d5a987b6a5 AMQ-6858 - Fix several durable subscription bridge propagation issues
Durable network proxy subs will now be properly created across multiple
bridges when 3 or more brokers are used.  Demand will be properly synced
and removed.

(cherry picked from commit 96ce14b278fef9e5f428f1c3c07ce5c09fd8f9a8)
2017-11-16 07:50:12 -05:00