Commit Graph

179 Commits

Author SHA1 Message Date
jbonofre 3c302dce33 [AMQ-7347] Don't log error in case of topic subscription failure. It's useless as the JMX exception is thrown and pollute the log. 2020-03-04 16:22:17 +01:00
jbonofre d11fd05af4 [AMQ-7301] Display warn in case of STOMP stream initialize error 2020-03-02 08:03:36 +01:00
Jonathan Gallimore 82b3d02fc2 Remove dependency activemq-http and activemq-stomp 2019-06-06 14:42:49 +01:00
Timothy Bish 063d24e6d6 AMQ-7218 Fix loss of Ack id from tracking after TX commit / abort
Ensure that we properly track Ack IDs across TX commit and abort
operations and only clear out values enlisted in the TX on commit and
re-acquire the Ack Ids on TX abort.
2019-05-29 17:25:30 -04:00
gtully 4129c1f659 AMQ-7209 suppress stack trace in stomp error frame for SecurityExceptions to avoid any implementation detail leakage, fix and test 2019-05-17 17:06:20 +01:00
avi5kdon b10458e2c6 AMQ-7125 Broker does not send error frame when an empty destination is sent with a stomp subscribe frame 2019-01-14 15:31:43 +00:00
Christopher L. Shannon (cshannon) 1e31df9800 AMQ-7047 - Switch default for hostname verification to be false for
server

For the client it makes sense to have it true by default but for the
server it makes sense to have it false by default
2018-08-31 13:04:14 -04:00
Christopher L. Shannon (cshannon) 69fad2a135 Add support for hostname verification 2018-08-31 06:39:49 -04:00
Timothy Bish 5fb470478f AMQ-7012 Fix STOMP protocol handler to log correct command names
Ensure Commands are logged correctly by the protocol converter.
2018-07-19 17:29:06 -04:00
Timothy Bish 9abbe826ec AMQ-7006 Remove STOMP pending acks after client acknowledge
Reworked patch from Avikash Mishra to remove tracked pending acks from a
STOMP subscription that has acked.
2018-07-19 16:58:47 -04:00
jgoodyear 46160c7b7f [AMQ-7011] Override dispatch to always set dispatchAsync true 2018-07-15 20:10:45 -06:00
gtully 41a100766c [AMQ-6824] - fix up prefetchExtension growth on transaction completion and delivered ack and tie in boolean usePrefetchExtension 2017-09-26 11:30:18 +01:00
Timothy Bish 4c986d102c AMQ-6796 Avoid double Ack on commit in STOMP individual ack mode
During commit of transaction when subscription mode is individual ack
the messages can get double acked leading to an error about receipt of
an invalid ack.
2017-08-23 12:21:03 -04:00
Christopher L. Shannon (cshannon) a9fe4e33c3 [maven-release-plugin] prepare for next development iteration 2017-06-27 13:41:28 -04:00
Christopher L. Shannon (cshannon) 5f0d6943cb [maven-release-plugin] prepare release activemq-5.15.0 2017-06-27 13:41:01 -04:00
Timothy Bish 2490c85fc5 AMQ-6699 Fix STOMP over WS not encoding header values
When sending STOMP frames out over WS the marshal isn't doing a proper
encode based on the STOMP version in use and so header values can be
transmitted without proper escaping.
2017-06-14 15:15:09 -04:00
Timothy Bish 8417ce537b AMQ-6697 Make the MBean explicitly final for java 7 support 2017-06-02 14:20:56 -04:00
Timothy Bish e83bb6dc38 AMQ-6697 Preserve dispatched state on client-individual tx ack
Need to preserve the messages in the dispatched list when a
client-individual ack comes in so that on abort the state remains
dispatched and the message can still be ack'd
2017-06-02 14:19:44 -04:00
Timothy Bish bd8661796b AMQ-6697 Adds a test to show that the described case works
Correctly ACK inside a TX and then Abort and then ACK again outside a TX
to show that the broker will then mark the message as consumed.
2017-06-02 11:50:14 -04:00
Christopher L. Shannon (cshannon) 4b3f07e90e https://issues.apache.org/jira/browse/AMQ-6441
https://issues.apache.org/jira/browse/AMQ-6526

Adding missing license headers
2016-12-07 13:32:18 -05:00
Torsten Mielke 9e35778943 https://issues.apache.org/jira/browse/AMQ-6526 - fix <Unknown> Stomp operation in ProtocolException.
closes #217
2016-12-06 13:52:06 +00:00
Hadrian Zbarcea be24a133ef This closes #88 (merged as a65ac586). More file permissions fixes. 2016-11-03 14:26:34 -04:00
Hadrian Zbarcea d5a929c0d2 This closes #205. Won't fix. (fix even more file permissions) 2016-11-03 14:11:40 -04:00
Hadrian Zbarcea d54d046b8a This closes #185. Won't fix. (fix more file permissions) 2016-11-03 11:54:33 -04:00
Christopher L. Shannon (cshannon) 98c5866c75 https://issues.apache.org/jira/browse/AMQ-6418
Properly setting the transport properties on the
AutoNIOSSLTransportServer and fixing the Stomp protocol to set the peer
certs when using auto+ssl
2016-09-06 10:17:05 -04:00
Christopher L. Shannon (cshannon) ed0e786b60 https://issues.apache.org/jira/browse/AMQ-6414
Changing the nio+ssl transports to trigger a serviceRead after start up
to prevent blocking. The prevents the channels from not reading in
certain cases, most notably with the auto+nio+ssl transport when used
for a network bridge.  Also added a couple tests and changed a network
bridge test to test out auto+nio+ssl.
2016-09-01 11:39:46 -04:00
Christopher L. Shannon (cshannon) 06a21dbbb3 [maven-release-plugin] prepare for next development iteration 2016-08-02 09:03:37 -04:00
Christopher L. Shannon (cshannon) 71cbc65283 [maven-release-plugin] prepare release activemq-5.14.0 2016-08-02 09:02:54 -04:00
gtully 3b626c9edc resolve intermittent failure - if broker closes socket on security excepiton before client gets response 2016-05-25 12:51:56 +01:00
Timothy Bish 1263dd8c43 Fix failing test in CI. Subscribe should request receipts so that the
subscription exists prior to initiating the event that triggers the
advisory message sent to the Topic.
2016-05-17 09:59:35 -04:00
Timothy Bish 2a10e9900a https://issues.apache.org/jira/browse/AMQ-5621
Add some additional test cleanup
2016-05-16 13:58:14 -04:00
Timothy Bish 15dc6cc765 https://issues.apache.org/jira/browse/AMQ-6246
Fix loop to not skip the composite split code.
2016-04-13 18:53:28 -04:00
Timothy Bish a9a1498d27 Add assert messages to test that failed in CI 2016-03-31 17:54:48 -04:00
gtully 57264bf8dc https://issues.apache.org/jira/browse/AMQ-6206 - ensure properties are marshalled before dispatch to broker so that their values are reflected in the memory usage 2016-03-09 22:13:46 +00:00
Timothy Bish 4e60075a32 https://issues.apache.org/jira/browse/AMQ-6169
Add additional null check
2016-02-17 13:17:37 -05:00
Timothy Bish b595b8bc12 https://issues.apache.org/jira/browse/AMQ-6169
Log actual STOMP frames that cause error at trace level, only log the
command action if it is present and valid.
2016-02-12 13:56:50 -05:00
Timothy Bish adf70bc08a https://issues.apache.org/jira/browse/AMQ-6168
Disconnect on unkown STOMP Command Action.
2016-02-12 12:36:39 -05:00
Timothy Bish 4ecff14030 NO-JIRA Update master version to 5.14.0-SNAPSHOT to match the eventual
release version.
2016-01-20 12:40:20 -05:00
Timothy Bish 7525729363 AMQ-6030 Adds some advisory topic specific tests to cover the composite
case for destination advisories.
2015-12-21 16:24:29 -05:00
Christopher L. Shannon (cshannon) cfb4ca9f54 [maven-release-plugin] prepare for next development iteration 2015-11-30 13:48:58 +00:00
Christopher L. Shannon (cshannon) abfe038ddf [maven-release-plugin] prepare release activemq-5.13.0 2015-11-30 13:48:11 +00:00
Timothy Bish c360c3e4a3 AMQ-6030 Add support for composite destinations to STOMP. 2015-10-30 11:02:33 -04:00
Dejan Bosanac e100638244 https://issues.apache.org/jira/browse/AMQ-6013 - init serializable packages statically 2015-10-20 12:30:57 +02:00
Dejan Bosanac a7e2a44fe8 https://issues.apache.org/jira/browse/AMQ-6013 - restrict classes which can be serialized inside the broker 2015-10-16 15:44:23 +02:00
Christopher L. Shannon (cshannon) e14aca871c https://issues.apache.org/jira/browse/AMQ-5889
-Cleaned up missing license headers and refactored packages.
-Added configuration options for a protocol detection timeout and
for the max number of connections accepted at the same time.
-Fixed a regression with connection counts
-Also added some more tests
2015-08-13 14:41:29 +00:00
Christopher L. Shannon (cshannon) 04ee70a161 https://issues.apache.org/jira/browse/AMQ-5889
Adding support for auto detection of wire protocols over a transport.
OpenWire, AMQP, STOMP, and MQTT can all be detected and the broker
will properly handle each one over a given Transport.  Currently
auto TCP, NIO, SSL, and NIO+SSL transports can handle auto-detection
of the wire format and client but support could be added in the
future for other transports like websockets.
2015-08-11 19:39:29 +00:00
Timothy Bish 6cdd750ddc [maven-release-plugin] prepare for next development iteration 2015-08-10 11:04:26 -04:00
Timothy Bish a9eeb03520 [maven-release-plugin] prepare release activemq-5.12.0 2015-08-10 11:04:17 -04:00
gtully a05a9a2129 https://issues.apache.org/jira/browse/AMQ-5552 - added profile for activemq.tests=smoke to run a fast subset of tests that gives a fast verification of a full build 2015-07-09 14:10:38 +01:00
Christopher L. Shannon (cshannon) 12b26b641b https://issues.apache.org/jira/browse/AMQ-5745
This commit is based off a patch submitted by admin@int3solutions.com.
It fixes several locations in the code where there are potential resource leaks.
2015-06-30 13:41:48 -04:00
Timothy Bish 2d7280f33a Adds a STOMP based test to cover some inactivity monitor usage over all
four transports.
2015-06-02 17:17:36 -04:00
Timothy Bish f37b005acf https://issues.apache.org/jira/browse/AMQ-5776
Add better support for maxFrameSize configuration that fits with the
defaults configuration for the broker by allowing the maxFrameSize to be
configured via ?wireFormat.maxFrameSize on STOMP, AMQP, and MQTT.
Previously we only supported transport.wireFormat.maxFrameSize.
2015-06-02 15:25:11 -04:00
Timothy Bish 3125caee5b https://issues.apache.org/jira/browse/AMQ-5794
implement transport.connectAttemptTimeout option across the transports
fro OpenWire, STOMP, AMQP and MQTT and add tests to cover.
2015-05-26 12:29:23 -04:00
Timothy Bish 540a66baa1 https://issues.apache.org/jira/browse/AMQ-5621
Cleanup the STOMP tests framework and shorten the test duration by only
using resources in each test that are actually needed, also fixes some
issues with tests that ran a long time just waiting for an end signal.
2015-05-20 19:22:43 -04:00
Timothy Bish aedf4ea5ff https://issues.apache.org/jira/browse/AMQ-5777
Remove unneeded StompConnection instance from the test.
2015-05-19 18:02:45 -04:00
Christopher L. Shannon (cshannon) a7a3c78fd9 Adding maxFrameSize to the Stomp Protocol to be consistent with Openwire.
This applies to  https://issues.apache.org/jira/browse/AMQ-5776
2015-05-19 17:34:52 -04:00
Timothy Bish 551f4fc4e0 https://issues.apache.org/jira/browse/AMQ-5621
The tests no longer need to worry about configuring the scheduler store
as the broker will use an in-memory or kahadb based version depending on
the broker persistence value.
2015-05-19 16:44:13 -04:00
Timothy Bish d2248e92d7 Shorten the test a bit with tigther memory limits which reduces the
amount of messages we need to send to fill and trigger plist store use.
Also add some time to the timeout to account for very slow disk I/O.
2015-04-28 12:19:37 -04:00
Timothy Bish 9ef4259297 https://issues.apache.org/jira/browse/AMQ-5616
Use ConcurrentMap in declarations
2015-04-28 11:15:08 -04:00
Timothy Bish 25c99a6c36 https://issues.apache.org/jira/browse/AMQ-5707
Add support for aborting a slow AMQP consumer and some testing.
2015-04-07 10:32:49 -04:00
Timothy Bish 4fe2bd534a https://issues.apache.org/jira/browse/AMQ-5622
Fix some issues with STOMP v1.2 protocol support.
2015-03-02 16:12:44 -05:00
Timothy Bish 388c16d084 https://issues.apache.org/jira/browse/AMQ-5590
Reduce test time, add timeouts etc.
2015-02-16 18:50:24 -05:00
Timothy Bish 8d4234345b https://issues.apache.org/jira/browse/AMQ-5573
Allow configuration of max size of STOMP command body via
transportConnector option transport.maxDataLength
2015-02-11 13:41:04 -05:00
gtully ae595c95b1 [maven-release-plugin] prepare for next development iteration 2015-01-30 12:46:19 +00:00
gtully 4ba1a1689f [maven-release-plugin] prepare release activemq-5.11.0 2015-01-30 12:46:08 +00:00
gtully bae0e60a7c fix intermittent failure 2015-01-27 15:50:56 +00:00
gtully 1e5d212768 https://issues.apache.org/jira/browse/AMQ-5513 - fix stomp regression - dependency on redelivered flag between stomp and jms is tenuous - but can be reliable via policy as shown 2015-01-27 15:38:16 +00:00
gtully bf5a2997c7 [maven-release-plugin] prepare for next development iteration 2015-01-26 16:48:46 +00:00
gtully eec2955bde [maven-release-plugin] prepare release activemq-5.11.0 2015-01-26 16:48:37 +00:00
gtully 64fa706d54 Revert "[maven-release-plugin] prepare release activemq-5.11.0"
This reverts commit f47fbe4b89.
2015-01-26 16:39:35 +00:00
gtully f47fbe4b89 [maven-release-plugin] prepare release activemq-5.11.0 2015-01-26 16:17:43 +00:00
Hadrian Zbarcea aedcae139b Revert "[maven-release-plugin] prepare release activemq-5.11.0"
This reverts commit 48b0cf396c.
2015-01-05 12:25:58 -05:00
Hadrian Zbarcea 89995f4723 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit 7b285c6f52.
2015-01-05 12:25:47 -05:00
Dejan Bosanac 7b285c6f52 [maven-release-plugin] prepare for next development iteration 2014-12-29 12:44:32 +01:00
Dejan Bosanac 48b0cf396c [maven-release-plugin] prepare release activemq-5.11.0 2014-12-29 12:44:20 +01:00
Timothy Bish 52d95ee01c https://issues.apache.org/jira/browse/AMQ-5423
Ensure that pendingAcks map is cleaned up either on a single message ACK
/ NACK or on TX commit or rollback
2014-11-05 15:32:55 -05:00
Timothy Bish 533cedc4fc https://issues.apache.org/jira/browse/AMQ-5220
Fixes empty message bodies from responses to statistics plugin queries
over the STOMP transport. 

This closes #41
2014-08-07 14:18:40 -04:00
Daniel Kulp 7fe431b21f Cleanup in ConnectTest to do two things:
1) connect/disconnect 500 (which still seems high) times instead of as many as possible in 25seconds.  On fast machines, this is MUCH faster.
2) Actually call Thead.start(), not Thread.run() in cases where it should be on a background thread.
2014-07-10 15:28:43 -04:00
Kevin Earls 11185c205e Update for AMQ-5242, exclude tests that hang on AIX 2014-07-10 11:12:28 +02:00
Timothy Bish 0fdd4611a0 Fix the getProxyToTopic method. 2014-06-24 14:24:39 -04:00
Kevin Earls fe1d050828 AMQ-5242 excluding text because of failures/hangs on AIX, Solaris, Windows 2014-06-23 16:02:10 +02:00
Dejan Bosanac fa086396a7 [maven-release-plugin] prepare for next development iteration 2014-06-05 11:59:29 +02:00
Dejan Bosanac 58dd93e42e [maven-release-plugin] prepare release activemq-5.10.0 2014-06-05 11:59:17 +02:00
Dejan Bosanac c2cf78542f [maven-release-plugin] prepare for next development iteration 2014-06-04 11:33:17 +02:00
Dejan Bosanac 5bc741f227 [maven-release-plugin] prepare release activemq-5.10.0 2014-06-04 11:33:03 +02:00
Hadrian Zbarcea 3845aaa43b Ignore crashing test in stomp, improve test timing 2014-04-29 15:17:17 -04:00
Timothy Bish fdc2551eb8 https://issues.apache.org/jira/browse/AMQ-5159
Fix an NPE condition
2014-04-23 11:34:17 -04:00
Timothy Bish c3d8ca7160 https://issues.apache.org/jira/browse/AMQ-5078 2014-02-27 10:01:49 -05:00
Hadrian Zbarcea 7b555c2898 AMQ-5047. Fix packaging issues related to maven version 2014-02-15 16:15:04 -05:00
Kevin Earls c027552035 Upgraded surefire plugin to 2.16. AMQ-5006 2014-01-30 14:22:44 +01:00
Timothy Bish 5e5458ec38 https://issues.apache.org/jira/browse/AMQ-3388
ignore unknown fields in openwire commands to allow interop between
openwire versions.
2013-11-13 10:36:53 -05:00
Hiram Chirino f7311567a0 Fixes https://issues.apache.org/jira/browse/AMQ-4840 - Invalid STOMP frame sent on websocket connections with heartbeats. 2013-10-30 13:55:55 -04:00
gtully 864aa6798f [maven-release-plugin] prepare for next development iteration 2013-10-14 23:38:35 +01:00
gtully 87c9bbebac [maven-release-plugin] prepare release activemq-5.9.0 2013-10-14 23:38:22 +01:00
gtully ee0933c71e [maven-release-plugin] prepare for next development iteration 2013-10-11 14:51:36 +01:00
gtully b276006911 [maven-release-plugin] prepare release activemq-5.9.0 2013-10-11 14:51:24 +01:00
Timothy Bish c7d33ad5e4 Logging cleanup, don't need all the if checks, use string substitution
more effectively.
2013-09-19 15:19:24 -04:00
Timothy Bish 8320e66b5d Fixes https://issues.apache.org/jira/browse/AMQ-4704 2013-09-03 11:50:52 -04:00
gtully 634a81898c https://issues.apache.org/jira/browse/AMQ-4682 - use spring.schemas for spring.xsd resolution - use brokerContext for configurationurl, support property PropertyPlaceholderConfigurer locations and system prop replacement, nested networkConnector elements - excludedDestinations,dynamicallyIncludedDestinations etc. lists and sets of destination 2013-09-03 00:28:46 +01:00
Timothy A. Bish 174fe15b30 fix for: https://issues.apache.org/jira/browse/AMQ-4676 and https://issues.apache.org/jira/browse/AMQ-4673
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1517052 13f79535-47bb-0310-9956-ffa450edef68
2013-08-23 21:27:27 +00:00