Commit Graph

9592 Commits

Author SHA1 Message Date
Timothy Bish 37c20ed19f NO-JIRA Add ability to set message reply-to for in tests
(cherry picked from commit 1316b57edb)
2016-10-06 15:52:04 -04:00
Timothy Bish 70432bf31c https://issues.apache.org/jira/browse/AMQ-6444
Fix failing tests
(cherry picked from commit a2995b7614)
2016-10-06 15:04:04 -04:00
Timothy Bish e2b1675a29 https://issues.apache.org/jira/browse/AMQ-6444
Remove some unneeded instance of checks and used cached values where
possible.
(cherry picked from commit baef8f8ec2)
2016-10-06 14:20:56 -04:00
Robert Gemmell aef6584b3a AMQ-6450: update to qpid-jms-0.11.1
(cherry picked from commit 3239e4f79e)
2016-10-03 16:52:49 +01:00
Christopher L. Shannon (cshannon) 991e97ad94 https://issues.apache.org/jira/browse/AMQ-6449
Disabling doclint now only activates for JDK 8

(cherry picked from commit 72650a0b8b)
2016-10-03 07:38:37 -04:00
Christopher L. Shannon (cshannon) 241d9d1565 NO-JIRA: More Java 8 JavaDoc fixes - also fixed findbugs for Java 8
(cherry picked from commit 02082b1aec)
2016-09-30 14:37:29 -04:00
Timothy Bish a6d2a16b4c https://issues.apache.org/jira/browse/AMQ-6438
Better interop for MapMessage with Binary value in the entries of the
payload, should convert back and forth the byte to allow Message to be
treated as a MapMessage and not fall back to a BytesMessage encoding.
(cherry picked from commit d88c4e46ec)
2016-09-29 11:12:34 -04:00
Timothy Bish aa32a0f792 https://issues.apache.org/jira/browse/AMQ-6444
Ensure that unsettled TX messages remain acquired and not redelivered to
the receiver.   Add several tests that demonstrate that a received
message can be released, rejected, accepted or modified after a TX
rollback if it was not settled.
(cherry picked from commit 0dd806f43f)
2016-09-28 15:08:49 -04:00
Timothy Bish aebb365ad4 https://issues.apache.org/jira/browse/AMQ-6438
Remove redundant tests and clean up a few small nits.
(cherry picked from commit 45f60e4133)
2016-09-28 15:08:39 -04:00
Timothy Bish 4575bee670 https://issues.apache.org/jira/browse/AMQ-6438
Add a new test for encode / decode validation.  Fix issue where the
internal scheduled message properties were escaping into the outbound
message.
(cherry picked from commit b1a9a9382b)
2016-09-28 15:08:29 -04:00
Timothy Bish 9cb92a225f https://issues.apache.org/jira/browse/AMQ-6438
JMS Transformer performance improvements and bug fixes

Trim unnecessary code and improve overall performance of the JMS
Transformer codecs.  Remove legacy Qpid JMS client related code from the
transformer as these are no longer supported.  Fix outgoing message that
do not match the structure of the incoming message that created them such
as message with had only a body being sent out with Headers and message
Properties.

(cherry picked from commit 63d62a71f5)
2016-09-28 15:08:18 -04:00
Timothy Bish 95faf0d87c https://issues.apache.org/jira/browse/AMQ-6438
Add additional test for larger more complex AMQP message
(cherry picked from commit 5702ec8d7c)
2016-09-28 15:08:09 -04:00
Timothy Bish 14c553a8ad https://issues.apache.org/jira/browse/AMQ-6438
Makes some improvements to the profiling test for the transformers.
(cherry picked from commit d4c7cce7d7)
2016-09-28 15:07:56 -04:00
Christopher L. Shannon (cshannon) 9ab56d59cc [maven-release-plugin] prepare for next development iteration 2016-09-27 13:06:49 -04:00
Christopher L. Shannon (cshannon) 594c79e531 [maven-release-plugin] prepare release activemq-5.14.1 2016-09-27 13:06:12 -04:00
Clebert Suconic 195046c503 NO-JIRA: Adding an extra test on AmqpTransactionTest
The test I'm adding was back ported from Artemis.
It will validate if the ACKs are nacked in case of a connection.close();
To avoid a situation where the TX would sit on a Transaction Resource Manager somewhere like an XID.
2016-09-27 12:16:16 -04:00
gtully 8e6fe414ad https://issues.apache.org/jira/browse/AMQ-6422 - move delivery tracking to pumpoutbound and additional test that shows how the presettle case breaks. Thanks to Robbie Gemmell for the feedback 2016-09-27 12:16:05 -04:00
gtully ebbb7ab437 https://issues.apache.org/jira/browse/AMQ-6422 - match proton sender view credit to prefetchExtension - tracking credit to dispatch delta to track additional flow requests. Proton sender layer is distinct from the transport layer - they mirror each other 2016-09-27 12:15:50 -04:00
Timothy Bish 0bb76c7fb4 NO-JIRA: Add some more variants of the .NET transaction tests
Adds ability to not settle accepted messages on the client to enable
creation of tests that are equivalent to the AmqpNetLite client's
transaction tests which hold settlement and expect the resource to
handle it on successful discharge.
2016-09-27 12:15:40 -04:00
Timothy Bish 9211661244 NO-JIRA: Small test client fix to close threads out faster. 2016-09-27 12:15:30 -04:00
Timothy Bish 12ee866a6e NO-JIRA: Add some additional tests ported from the .NET AMQP client
Adds some transaction tests ported from AMQP .NET client with some
variances based on the way the test client works and limitations in the
brokers handling of Transacted sends.
2016-09-27 12:15:18 -04:00
Timothy Bish fa5514985d NO-JIRA AMQP Test updates
Adds support for doing sends and receives that are enrolled in a
transaction created in a session other than the session that created the
sender or receiver.  Adds some tests that show this in action.
2016-09-27 12:15:06 -04:00
Timothy Bish 14c5c5276c https://issues.apache.org/jira/browse/AMQ-6422
Adds a split consumer test that uses presettled receivers.
2016-09-27 12:14:55 -04:00
Timothy Bish 566e82614a https://issues.apache.org/jira/browse/AMQ-6422
Small fix to test and check for zero inflight on successive send to
destination that should have no credit on the registered receiver.
2016-09-27 12:14:43 -04:00
Timothy Bish ca11674f37 https://issues.apache.org/jira/browse/AMQ-6422
Add test for credit grants but no settles for a single receiver.
2016-09-27 12:14:31 -04:00
Timothy Bish a5a4262b54 Allow the AMQP test client to also be configure to trace frames
The test client can allow for quick tracing of the frame traffic via a
call to setTraceFrames on the client or connection instance before
connection to the remote.  This allows for tests to easily switch on /
off tracing.  The log4j.properties is also updated to output frame
tracing with the URI option is put on the AMQP transport or the client
value is enabled.  
Conflicts:
	activemq-amqp/src/test/resources/log4j.properties
2016-09-27 12:14:08 -04:00
Timothy Bish b77b3c428b Add a test case for anonymous sender links using simple test client. 2016-09-27 12:13:04 -04:00
Timothy Bish cc0e78790f https://issues.apache.org/jira/browse/AMQ-6422
I've made a few minor test changes and added a couple more cases.  Under
heavy CPU load I'm able to get test,
testReceiveMessageAndRefillCreditBeforeAcceptOnQueue to fail on the
second receive call where it should get the second message since it
granted credit.
2016-09-27 12:12:43 -04:00
gtully 94ffb1bf81 AMQ-6422 - include the inflight count in the prefetch for positive remote credit flows. Fix and test 2016-09-27 12:12:33 -04:00
Christopher L. Shannon (cshannon) 02d53a0d9f Revert "[maven-release-plugin] prepare release activemq-5.14.1"
This reverts commit 422b231c25.
2016-09-27 11:57:35 -04:00
Christopher L. Shannon (cshannon) 354142adf1 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit 47a652ef2a.
2016-09-27 11:57:25 -04:00
Christopher L. Shannon (cshannon) 47a652ef2a [maven-release-plugin] prepare for next development iteration 2016-09-27 08:58:13 -04:00
Christopher L. Shannon (cshannon) 422b231c25 [maven-release-plugin] prepare release activemq-5.14.1 2016-09-27 08:57:19 -04:00
Christopher L. Shannon (cshannon) c6f56738d7 NO-JIRA: Disabling doclint check so jdk8 can be used to build javadocs
(cherry picked from commit 507bf3ab01)
2016-09-27 08:21:35 -04:00
Christopher L. Shannon (cshannon) ae97f7dfb7 NO-JIRA: Adding 5.14.1 schema entry
(cherry picked from commit 26e7136ab7)
2016-09-27 08:05:56 -04:00
Krzysztof Sobkowiak 4808b35b5f https://issues.apache.org/jira/browse/AMQ-6442
Config file org.apache.activemq.server-default.cfg points config to ${karaf.base}/etc

(cherry picked from commit 132840b09f)
2016-09-27 08:00:01 -04:00
Christopher L. Shannon (cshannon) b1c09d9a85 https://issues.apache.org/jira/browse/AMQ-6436
The temporary store will now delete the old temp directory on start up
if lazyInit is true instead of waiting for the store to initialize to
clear up space.  This prevents space on the disk from being wasted with
old data if the temp store isn't initialized

(cherry picked from commit a82c95cd29)
2016-09-23 15:49:38 -04:00
Christopher L. Shannon (cshannon) bf7a19eead https://issues.apache.org/jira/browse/AMQ-6431
Fixing BitArrayBin to not overflow in certain cases with numbers larger
than Int max

(cherry picked from commit 09456480b8)
2016-09-23 14:31:23 -04:00
Christopher L. Shannon (cshannon) e0c70b843f https://issues.apache.org/jira/browse/AMQ-6430
Modifying patch so that only stores that persist the noLocal flag will
check if this flag has changed to prevent a subscription from being
deleted by mistake

(cherry picked from commit 18571ce09b)
2016-09-23 11:26:22 -04:00
Christopher L. Shannon (cshannon) 8bde32a07c https://issues.apache.org/jira/browse/AMQ-6433
Generating a new equals method in TypeConversionSupport so the proper
null checks exist

(cherry picked from commit 2b99ffcc22)
2016-09-23 08:04:36 -04:00
Christopher L. Shannon (cshannon) a80f7ccbe1 https://issues.apache.org/jira/browse/AMQ-6434
Rewriting logic in finally block of PooledTaskRunner to avoid using a
return statement

(cherry picked from commit f25e7ab47f)
2016-09-23 08:04:30 -04:00
Christopher L. Shannon (cshannon) d3b86e77dd https://issues.apache.org/jira/browse/AMQ-6430
When a nolocal durable consumer reconnects the new connectionId is properly captured for
the NoLocal expression so that nolocal works on reconnect.  Also fixed
the detection of the nolocal value changing on consumer connect.

(cherry picked from commit 7c293b661f)
2016-09-21 09:35:38 -04:00
Timothy Bish 48036bff05 https://issues.apache.org/jira/browse/AMQ-6427
Move to Qpid JMS 0.11.0
(cherry picked from commit 5de9bdac08)
2016-09-09 11:18:27 -04:00
gtully f0d898cc9d AMQ-6403 - add indexDirectory attribute to kahadb plist impl - settable via broker service tempDataStore
(cherry picked from commit 5a874816b7)
2016-09-08 15:36:44 -04:00
gtully 1d1c9262fd AMQ-6406 - ensure duplicates trapped by the cursor-add or queue-page-in are removed from the message store
(cherry picked from commit 2b1cda1964)
2016-09-08 15:36:15 -04:00
gtully cf004c205d AMQ-6413 - ensure audit update on skipped store add for kahadb concurrentStoreAndDispatch. Fix and test
(cherry picked from commit f8bc19b96d)
2016-09-08 15:35:32 -04:00
Christopher L. Shannon (cshannon) 5956bdc1f5 https://issues.apache.org/jira/browse/AMQ-6423
Fixing durable sync over a network bridge so that network subscriptions
that are no longer permissible are also cleaned up

(cherry picked from commit a038655605)
2016-09-08 08:29:03 -04:00
Christopher L. Shannon (cshannon) 4dbe61dd56 https://issues.apache.org/jira/browse/AMQ-6418
Fixing mqtt link stealing default setting for auto transport

(cherry picked from commit 88af1c70d9)
2016-09-07 08:28:36 -04:00
Christopher L. Shannon (cshannon) c4bc626fea https://issues.apache.org/jira/browse/AMQ-6420
Properly copying wire format options map before applying to the
transport when using auto transports so that the options do not get
cleared and will be used for all future connections

(cherry picked from commit 9ab94883a8)
2016-09-07 07:44:07 -04:00
Christopher L. Shannon (cshannon) c99eb1d600 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

(cherry picked from commit 98c5866c75)
2016-09-06 10:19:20 -04:00