Commit Graph

425 Commits

Author SHA1 Message Date
Timothy Bish d54e21b2ff https://issues.apache.org/jira/browse/AMQ-6374
Refactor transformer to better map AMQP messages to JMS message types
and better preserve the original encoding of stored messages so that
they can be sent back to an AMQP client with expected content types.
Adds additional interoperability tests.
2016-07-25 18:15:53 -04:00
Timothy Bish 4b018b4206 https://issues.apache.org/jira/browse/AMQ-6339
Clean up the transport implementation and reduce duplication.
2016-07-18 16:54:37 -04:00
Timothy Bish a35e8dc8a2 https://issues.apache.org/jira/browse/AMQ-6359
Allow a receiver link to enable consumer options on the subscription
such as exclusive and retroactive using options encoded on the address
2016-07-14 16:08:34 -04:00
Timothy Bish 16c487a7b9 https://issues.apache.org/jira/browse/AMQ-6353
Fix and test for encoding the correlation Id value to the ActiveMQ
message object's string value
2016-07-12 14:19:01 -04:00
Timothy Bish c9c05eb866 NO-JIRA Update this test to test across all transformers. 2016-07-12 10:57:07 -04:00
Timothy Bish 31c55f7510 https://issues.apache.org/jira/browse/AMQ-6339
Add support for AMQP client to connect using WebSockets.
2016-06-30 14:52:40 -04:00
Timothy Bish 83827f2770 https://issues.apache.org/jira/browse/AMQ-6341
Wait on broker response for async broker commands.
2016-06-29 20:13:34 -04:00
Timothy Bish 4e23adfcc9 https://issues.apache.org/jira/browse/AMQ-6340
combine the lists in the correct order for later redispatch.
2016-06-29 12:57:30 -04:00
Timothy Bish e02c1a17f8 https://issues.apache.org/jira/browse/AMQ-6286
Create a follow on test showing AMQP respects order.
2016-06-24 09:39:48 -04:00
Timothy Bish d563e9019d Test for message property handling cross protocols.
Add a test that validates that message properties are propagated between
OpenWire and AMQP.
2016-06-22 18:05:39 -04:00
Timothy Bish 94ca7039b1 Add a rollback test that rolls back repeatedly using new connections. 2016-06-22 13:02:14 -04:00
Timothy Bish a95d6fd4eb Adds a start of message interoperability test for OpenWire <-> Qpid JMS 2016-06-21 13:01:19 -04:00
Timothy Bish 27d955501f Add some additional tests for dynamic sender / receiver links 2016-06-16 15:59:56 -04:00
Timothy Bish f595f3c20d Handle the case where the remote doesn't set any properties resulting in
a null instance being returned from the properties getter.
2016-06-15 18:55:13 -04:00
Timothy Bish dbed28e625 https://issues.apache.org/jira/browse/AMQ-6320
Turn off support for non SASL connections by default, can be enabled on
the TransportConnector URI if needed.
2016-06-10 17:55:28 -04:00
Timothy Bish c5998444cf https://issues.apache.org/jira/browse/AMQ-6319
Additional fixes and tests for disable of non-SASL client connects.
2016-06-10 17:11:44 -04:00
Timothy Bish 534dbee447 NO-JIRA: Add test to show behavior of non-prefixed addresses that
default to Queue.
2016-06-10 09:50:59 -04:00
Timothy Bish c49db029ab https://issues.apache.org/jira/browse/AMQ-6319
Improve configuration for disabling non-SASL connections.
2016-06-09 17:32:41 -04:00
Timothy Bish 28e7cb0b21 https://issues.apache.org/jira/browse/AMQ-6309
Fix some minor issues shown by static code analysis
2016-06-03 18:05:40 -04:00
Timothy Bish db71b43b19 https://issues.apache.org/jira/browse/AMQ-6305
Lower prefetch on settlement of allow for dispatch of the full amount of
granted credit.  Adds additional tests.
2016-06-03 17:05:00 -04:00
Timothy Bish 76b70545f2 https://issues.apache.org/jira/browse/AMQ-6304
Ensure that the broker send a container ID using its assigned Broker
name value.
2016-06-01 18:38:41 -04:00
Timothy Bish 8448cf1cb8 https://issues.apache.org/jira/browse/AMQ-6305
Refactor credit handling and drain state tracking to ensure we stay in
sync with the remote state and always answer drain requests.  Start
adding some more tests around drain to the interop suite.
2016-06-01 18:30:31 -04:00
Timothy Bish 6ae169e275 https://issues.apache.org/jira/browse/AMQ-6305
Add test and supporting enhancements to the JUnit module to allow for
easy repetition of tests that don't always fail reliably
2016-05-26 18:02:59 -04:00
Timothy Bish 08f266d762 Remove unused import. 2016-05-26 16:52:18 -04:00
Timothy Bish 4d6f4d7475 https://issues.apache.org/jira/browse/AMQ-6263
Encode the incoming messageId value into a string using type prefixes
and decode them on the way out to ensure that we preserve the original
AMQP MessageId type and value.
2016-04-26 18:08:11 -04:00
Timothy Bish 98165c4b69 https://issues.apache.org/jira/browse/AMQ-6228
Create a better error message that for the invalid frame size error.
2016-03-31 16:52:34 -04:00
Timothy Bish f6d25842cc NO-JIRA Adds some small fixes to the AMQP test client around SSL
handling that were found in Qpid JMS where some of this came from.
2016-02-29 16:13:28 -05:00
Timothy Bish bbb17da52f https://issues.apache.org/jira/browse/AMQ-6147
Add a test that can reproduce an issue seen when emitFlowOnSend is
disabled on the proton transport to allow for further investigation.
2016-02-18 16:07:59 -05:00
Timothy Bish 33e27a4f5a NO-JIRA: Add some additional assertions so tests fail more cleanly in
the case of a receive not getting a message before it's assigned
timeout.
2016-02-17 11:34:25 -05:00
Robert Gemmell 3f7b2d6bb0 AMQ-6147: update to proton-j 0.12.0 release 2016-02-16 17:21:12 +00: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 19ea5515c8 https://issues.apache.org/jira/browse/AMQ-6107
Remove the deprecated setPrefetch option
2015-12-22 16:16:23 -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 d9e22a9368 https://issues.apache.org/jira/browse/AMQ-6044
Clean up some test client code.
2015-11-23 16:55:11 -05:00
Timothy Bish 272fb2b973 https://issues.apache.org/jira/browse/AMQ-6044
Add support for transactions to the test client.
2015-11-20 17:48:14 -05:00
Timothy Bish b5dd0a16f4 https://issues.apache.org/jira/browse/AMQ-6055
Account for Authzid in SASL PLAIN mechanism and provide a means to fail
the authorization if the challenge response is invalid.  Update the
client to properly exclude sasl mechanism that don't apply to it's
configured credentials such as using only ANONYMOUS when no user or
password is set.
2015-11-20 14:39:03 -05:00
Robert Gemmell d7e4c6d96f AMQ-6055: fix for earlier change to plain response encoding 2015-11-20 18:19:27 +00:00
Robert Gemmell ce5628a389 AMQ-6055: uptest test client and add [currently-ignored] test to demonstrate the issue 2015-11-20 17:55:41 +00:00
Timothy Bish 5d353e241b https://issues.apache.org/jira/browse/AMQ-6037
Add support for amqp style variants of the ActiveMQ job scheduler
options set in message annotations.
2015-11-10 18:12:40 -05:00
Timothy Bish 480b3e7c36 https://issues.apache.org/jira/browse/AMQ-6037
Add support for the delivery time header to allow for scheduled messages
at a desired time.
2015-11-09 12:00:38 -05:00
Timothy Bish a42be999cb NO-JIRA Fix test with commented out assertion. 2015-11-06 16:15:37 -05:00
Timothy Bish 82a5839fc7 NO-JIRA Update test client to have no real linkage to the activemq
internals to make it easier to share the tests with Artemis.
2015-11-04 12:47:57 -05:00
Robert Gemmell 037f91d61e AMQ-6031: use System.nanoTime() when deriving time to tick the transport with for idle-timeout handling 2015-10-30 16:28:53 +00:00
Timothy Bish 7c06d8d683 NO-JIRA Allow validation points to use asserts, adds a new test in idle
test.
2015-10-22 10:55:33 -04:00
Timothy Bish 490436c136 https://issues.apache.org/jira/browse/AMQ-6015
Add support for returning some more meaningful error codes.
2015-10-19 15:49:47 -04:00
Timothy Bish 5c5ced8e87 NO-JIRA enable test that was ingored for the old amqp-1.0 JMS client,
now works with QPid JMS.
2015-10-16 12:23:28 -04:00
Timothy Bish e8a0d042d8 NO-JIRA - Fix some warnings from unused imports and use of deprecated
methods.
2015-10-14 12:51:02 -04:00
Timothy Bish 80b526be7d https://issues.apache.org/jira/browse/AMQ-6010
Fix for failed SSL connections not releasing the connection count in the
transport which leads to connections being rejected as having eceeded
the maximum configured connections.
2015-10-14 11:39:24 -04:00
Timothy Bish bbcd938032 https://issues.apache.org/jira/browse/AMQ-6001
Refill credit at a slightly faster rate.
2015-10-06 11:33:35 -04:00
Timothy Bish 81b4b9ae3d https://issues.apache.org/jira/browse/AMQ-5996
When possible check for noLocl changes on durable subscription
reactivation and recreate the durable sub if it changes.  For both
selector change and noLocal change also update the AbstractSubscription
selectorExpression so it matches with what was requested.
2015-10-01 19:23:58 -04:00
Robert Gemmell 049f8da236 AMQ-5891: update to the proton 0.10 release 2015-08-14 15:17:19 +01: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
Robert Gemmell 0cfd225912 AMQ-5890: prevent NPE if Modified disposition is applied without the delivery-failed flag set, add some general tests of Modified handling
https://issues.apache.org/jira/browse/AMQ-5890
2015-07-16 12:46:24 +01: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
Timothy Bish 13044decce https://issues.apache.org/jira/browse/AMQ-5848
Use the latest openwire version marshallers in the KahaDB store when
starting from a clean install, drop back to the version used in the
existing store if one is found.
2015-07-08 17:29:32 -04:00
Timothy Bish cd32c60f39 https://issues.apache.org/jira/browse/AMQ-5850
Use JMS Transformer by default for inter-protocol interoperability.
2015-06-18 15:00:12 -04:00
Timothy Bish 833d30837b https://issues.apache.org/jira/browse/AMQ-5848
Introduce OpenWire v11 which adds noLocal to the SubscriptionInfo, if
configured KahaDB can store that version and the noLocal value is
recovered from the store.
2015-06-18 14:25:07 -04:00
Timothy Bish ed266835b5 https://issues.apache.org/jira/browse/AMQ-5847
Add workarounds to allow for TX work to take place in multiple sessions
on the same connection.  Future work needed to properly support TXN
Capabilities defined in the spec and support checking of violations of
expected behavior.
2015-06-16 16:41:18 -04:00
Timothy Bish c2310391b9 https://issues.apache.org/jira/browse/AMQ-5845
provide server information in connection properties.
2015-06-15 18:38:12 -04:00
Timothy Bish 732fd56840 https://issues.apache.org/jira/browse/AMQ-5839
Disable failing test, broker doesn't currently recover the noLocal state
for a durable subscription.
2015-06-12 16:43:34 -04:00
Timothy Bish 4945c83d70 https://issues.apache.org/jira/browse/AMQ-5839
Use correct name for the no-local filter
2015-06-12 16:11:55 -04:00
Timothy Bish d74c087134 Add a negative validation test. 2015-06-12 15:39:17 -04:00
Timothy Bish d723d14acb Add some additional control over what is configured on the running
broker.
2015-06-12 14:26:55 -04:00
Timothy Bish 11da37b991 https://issues.apache.org/jira/browse/AMQ-5828
Fixed bad default for message persistence that breaks AMQP specification
defined behavior when the durable value is not present in the Header.
2015-06-05 11:21:27 -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
Robert Gemmell 138e52b08c AMQ-5801: add error condition hint via the info map to signal the container-id was the invalid field 2015-05-27 18:09:45 +01:00
Timothy Bish 5e7b70f11f https://issues.apache.org/jira/browse/AMQ-5413
ensure drain completion clear currently tracked credit value, next flow
should update to the correct value.
2015-05-27 11:30:29 -04:00
Timothy Bish 17bcf43048 https://issues.apache.org/jira/browse/AMQ-5799
Resolve a compilation error.
2015-05-27 06:10:08 -04:00
Timothy Bish ffcd99ac85 https://issues.apache.org/jira/browse/AMQ-5799
Add unit test for case of JMS AMQP client changing properties on a
durable sub when resubscribing, not working with current version. 

fix: Use existing filters map to avoind creating a new instance.
2015-05-26 18:28:28 -04:00
Timothy Bish b5c6264789 https://issues.apache.org/jira/browse/AMQ-5799
Return the noLocal filter and set selector if one exists for the
existing durable subscription when a lookup is requested.
2015-05-26 17:30:54 -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 13b915ad19 https://issues.apache.org/jira/browse/AMQ-5795
Allow fallback of message transformers when configured one can't handle
the incoming message.
2015-05-22 18:57:42 -04:00
Timothy Bish f05ff94e5c https://issues.apache.org/jira/browse/AMQ-4900
Strip delivery annotations from the incoming messages when using JMS
transformer, the other transformers don't currently have a way to do
this.
2015-05-20 14:54:13 -04:00
Timothy Bish 7c41ebc912 https://issues.apache.org/jira/browse/AMQ-5778
Fixes and some testing around maxFrameSize handling on the AMQP
Transport.
2015-05-18 14:51:56 -04:00
Timothy Bish 3e599a595f Allow a test to turn of JMX if desired. 2015-05-15 11:03:35 -04:00
Timothy Bish 29fb4a4b3f Add some additional tests for durable subscription recovery and lookup. 2015-05-14 18:56:34 -04:00
Timothy Bish a812131db7 Add some tests around honoring the transportConnector maximumConnections
option
2015-05-08 13:37:53 -04:00
Timothy Bish 6a2ffca57e https://issues.apache.org/jira/browse/AMQ-5699
Use constant symbols that are now available in v0.9+ of proton-j
2015-05-05 19:04:44 -04:00
Timothy Bish 4b4cf7c09e https://issues.apache.org/jira/browse/AMQ-5757
Add inactivity monitoring and heartbeats to the AMQP transport.
2015-05-05 18:36:15 -04:00
Robert Gemmell fa81c1ff73 AMQ-5763: ensure we replenish the credit for the transaction coordinator link
https://issues.apache.org/jira/browse/AMQ-5763
2015-05-05 19:35:20 +01:00
Timothy Bish 32f21ff1a9 https://issues.apache.org/jira/browse/AMQ-5763
Capture the reported issue in a test case to track the fix.
2015-05-05 11:18:17 -04:00
Robert Gemmell b77eba471d AMQ-5699: upgrade to Proton 0.9.1 release
https://issues.apache.org/jira/browse/AMQ-5699
2015-05-03 15:12:44 +01:00
Timothy Bish b444b6c463 Fix a couple log messages. 2015-04-28 14:24:45 -04:00
Robert Gemmell 3a5f127d52 AMQ-5738: Ensure the sender links for non-durable consumers also get unregistered, remove duplicate closed field, fix method names. 2015-04-22 10:17:38 +01:00
Timothy Bish b313209aa2 https://issues.apache.org/jira/browse/AMQ-5711
Reject sender / receiver creation when the address is a temp destination
prefixed value but the destination doesn't map down to a temp
destination created using a dynamic link which means the orignal
connection ID where the destination was created cannot be determined.
2015-04-21 17:45:45 -04:00
Timothy Bish ff1a1c4985 https://issues.apache.org/jira/browse/AMQ-5737
lookup transformer using case insensitive compare.
2015-04-21 15:58:06 -04:00
Timothy Bish 2013c6a54f Update some logging for better coverage 2015-04-16 18:46:40 -04:00
Timothy Bish a5c2f3f423 https://issues.apache.org/jira/browse/AMQ-5731
Add some additional checks and handlers for frames with an invalid size
prefix and ensure that the connection state is torn down broker side.
2015-04-16 14:53:22 -04:00
Timothy Bish 31834ed1fb https://issues.apache.org/jira/browse/AMQ-5731
Ensure that a ShutdownInfo is propagated to the Broker when the AMQP
transport encounters an unrecoverable error.
2015-04-15 18:30:13 -04:00
Timothy Bish a5a52b6517 add a test that sends multiple messages at a Queue. 2015-04-14 17:22:14 -04:00
Timothy Bish cb370d06e9 Add a test for the unsettled sate as well, and some logs. 2015-04-14 12:33:05 -04:00
Timothy Bish b3bf8e74f2 https://issues.apache.org/jira/browse/AMQ-5723
Ensure that we settle the delivery state of incoming deliveries that are
already remotely settled so that the resources associated are freed.
2015-04-14 11:18:32 -04:00
Timothy Bish 47f5c08573 turn on informational messages from qpid-jms 2015-04-14 09:29:12 -04:00
Timothy Bish f0ebda7ef9 Add a bit of logging for link and session level events. 2015-04-13 09:39:05 -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 3d6bb7c392 https://issues.apache.org/jira/browse/AMQ-5704
send correct order of preferred SASL mechanisms.
2015-04-01 10:18:01 -04:00