Commit Graph

234 Commits

Author SHA1 Message Date
gtully 5aef16ad06 https://issues.apache.org/jira/browse/AMQ-5256 - fix spurious amqp ioexception on concurrent connection protocol discrimination, client would see a hang on open. additional test 2014-07-01 22:34:44 +01:00
Dejan Bosanac 7bfbce9a54 minor cleanup 2014-05-29 16:41:07 +02:00
Dejan Bosanac e9126f3513 ignore JmsClientRequestResponseTest until we have qpid/proton libs with appropriate fixes 2014-05-29 16:41:06 +02:00
Timothy Bish f2653e6936 Clean up a bit, remove commented out code from other transports. 2014-05-28 15:27:34 -04:00
Timothy Bish ba519d8bd3 https://issues.apache.org/jira/browse/AMQ-5195
Use largest incoming capaity value, broker will do flow control based on
destination policies.
2014-05-23 11:26:55 -04:00
Timothy Bish 9b6f419d44 https://issues.apache.org/jira/browse/AMQ-5195
Set session incoming credit value and improves the flow handling to
reduce chatter on each message send, improves overall producer
performance significantly.
2014-05-20 18:26:17 -04:00
Timothy Bish b9d51bf1d4 Use a fixed buffer to handle incoming deliveries from proton via the
receiver.recv method instead of allocating a new byte array each time as
the contents are copied out to create the complete frane
2014-05-15 15:28:02 -04:00
Dejan Bosanac ff64b14bc7 https://issues.apache.org/jira/browse/AMQ-5186 - remove amqp producers 2014-05-15 15:13:01 +02:00
Timothy Bish 38a86b470f https://issues.apache.org/jira/browse/AMQ-5183
Swithc to using Proton's Evet collector for processing engine state
changes.  All tests passing locally with this change.
2014-05-12 15:23:42 -04:00
Timothy Bish da07a11760 https://issues.apache.org/jira/browse/AMQ-4563
Fix for client's that use a message Id similar to ActiveMQ's version
which can throw off the ack later on when a stored message is
dispatched.
2014-03-27 11:33:50 -04:00
Timothy Bish 13b33da37b Remove use of deprecated use MessageImpl and load the Proton
MessageFactory instead.
2014-03-20 13:05:19 -04:00
Timothy Bish e06e23b9f3 https://issues.apache.org/jira/browse/AMQ-5110
Set accepted outcome for successful commit and rollback.
2014-03-19 12:55:43 -04:00
Timothy Bish 1671523076 https://issues.apache.org/jira/browse/AMQ-5096
Return proper error code for unathorized access.
2014-03-12 16:13:04 -04:00
Kevin Earls c8a5fb769e Fix for https://issues.apache.org/jira/browse/AMQ-5073 2014-03-11 14:58:13 +01:00
Kevin Earls 87420cc455 Fix for AMQ-5093. amqp+nio and amqp+nio+ssl were failing on large messages 2014-03-11 12:00:16 +01:00
Timothy Bish da5d0d819e Clean up some imports and get rid of some warnings throught the code. 2014-03-07 18:12:04 -05:00
Kevin Earls 2360fb8596 Fix for AMQ-5073, updated AmqpNioSslTransport.java to propery handle frames. Also fixed bugs in amqp test, as seen in AMQ-5062 2014-02-28 10:58:15 +01:00
Timothy Bish da72aa6570 https://issues.apache.org/jira/browse/AMQ-5075 2014-02-24 16:09:46 -05:00
Kevin Earls da63f3f20a Fix for https://issues.apache.org/jira/browse/AMQ-5042. Handles receiving multiple frames at once from an nio channel 2014-02-18 10:52:37 +01:00
Timothy Bish e102e64e9d Use non-deprecated output methods for proton to allow for faster bulk
sends of outbound amqp frames.
2014-02-04 12:47:42 -05:00
Hiram Chirino 875822de51 Fixes AMQ-5002: Support receiving AMQP messages which do not have the timestamp set but the expiration is set. 2014-01-30 09:51:53 -05:00
Timothy Bish 19344991af Add some additional logs 2014-01-29 12:41:43 -05:00
Timothy Bish efc51fa448 https://issues.apache.org/jira/browse/AMQ-4741
Set state to accepted if message received is properly handled.
2014-01-08 17:28:39 -05:00
Timothy Bish 283cdd0502 https://issues.apache.org/jira/browse/AMQ-4914
Up the max frame size to a value of 1mb so that we are restricted by the
default in the QPid client which is 32k.
2014-01-08 11:27:39 -05:00
Timothy Bish 3af70ba285 https://issues.apache.org/jira/browse/AMQ-4962
ensure immediate removal of connection MBean
2014-01-06 17:38:41 -05:00
Timothy Bish c387e842ee https://issues.apache.org/jira/browse/AMQ-4920
And code to prevent concurrent writes to a message when dispatched to
multiple Topic consumers.
2013-12-17 15:22:08 -05:00
Timothy Bish 7319697da5 https://issues.apache.org/jira/browse/AMQ-4753
Adds more NIO+SSL test via Joram test runs.
2013-10-09 11:21:28 -04:00
Timothy Bish 0f9a347996 https://issues.apache.org/jira/browse/AMQ-4753
Quick fix for getting past protocol discrimination and passing on proper
Buffers of data to the protocol converter.
2013-10-08 17:53:51 -04:00
Timothy Bish fba8e25563 apply patch for: https://issues.apache.org/jira/browse/AMQ-4713 2013-09-19 07:00:26 -04:00
Hiram Chirino 8d5b9a5587 Adding hooks so that in the future we can more easily support handling older versions of the AMQP protocol. 2013-09-18 15:26:07 -04:00
Timothy Bish e1bbde7302 https://issues.apache.org/jira/browse/AMQ-4721
Upgrade to latest slf4j library and update many LOG statements to use
proper calls (no string concats).  Removes many uneeded isXXXEnabled
checks to clean up the code.
2013-09-13 14:53:41 -04:00
Timothy Bish ebe54c46b3 Fix and tests for: https://issues.apache.org/jira/browse/AMQ-4596
Updates to proton 0.5
2013-09-04 10:26:44 -04:00
Timothy Bish d2f4d76f83 apply patch for: https://issues.apache.org/jira/browse/AMQ-4696 2013-09-03 16:13:53 -04:00
Timothy A. Bish 0f6561bae0 fix and tests for: https://issues.apache.org/jira/browse/AMQ-4651
ensure consumers get removed from the session on close. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1509291 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 15:25:23 +00:00
Timothy A. Bish ed5d841c21 fix and tests for: https://issues.apache.org/jira/browse/AMQ-4651
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1509046 13f79535-47bb-0310-9956-ffa450edef68
2013-07-31 22:05:27 +00:00
Hiram R. Chirino 7938cc6943 Fixes AMQ-4376 - JoramJmsTest QueueBrowserTest.testSenderBrowser fails intermittently.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1495058 13f79535-47bb-0310-9956-ffa450edef68
2013-06-20 15:43:54 +00:00
Hiram R. Chirino e8eb58ada3 Improve how trace logging is handled in the AMQP transport.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1495057 13f79535-47bb-0310-9956-ffa450edef68
2013-06-20 15:43:44 +00:00
Timothy A. Bish bbab23ee7b Improve logging.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1493136 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 16:06:55 +00:00
Timothy A. Bish 205c6bec88 Fix for potential NPE
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1493110 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 15:18:51 +00:00
Timothy A. Bish 44e3c22652 fix for failing test case.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1492373 13f79535-47bb-0310-9956-ffa450edef68
2013-06-12 19:05:53 +00:00
Timothy A. Bish 3513728f0f Add some more asserts to the test and clean up logging in the protocol converter, replace all the System.out.println calls
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1492250 13f79535-47bb-0310-9956-ffa450edef68
2013-06-12 15:41:56 +00:00
Timothy A. Bish d338d8a0d6 https://issues.apache.org/jira/browse/AMQ-4568
fix potential NPE

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1490317 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 15:07:39 +00:00
Hiram R. Chirino b2b4fc81f7 Fix for AMQ-4563: Changes the KahaDB store to use a more consistent key for message ids. MessageId.toString can change depending on how the message was encoded.
Support storing the externally generated message id of a message in the MessageID class so that Selectors can operate against that external message id.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1488353 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 18:53:48 +00:00
Timothy A. Bish 059258b195 Add some more tracing capabilities
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1488048 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 23:22:16 +00:00
Timothy A. Bish 03a2c5e81e https://issues.apache.org/jira/browse/AMQ-4563
Updated the test case some more, shows that its a problem with the MessageId handling when we receive Messages from the AMQP JMS client, when we use our own JMS client to send the the IDs are correct and we can properly ack them

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1487950 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 18:07:54 +00:00
Timothy A. Bish b62648b8d7 fix for: https://issues.apache.org/jira/browse/AMQ-4560
ensure dispatched Messages are set to Read Only mode before passing onto the transformer. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1486951 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 15:04:25 +00:00
Christian Posta 0e148fb4ba Added tests for AMQP to JMS transformations
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1449562 13f79535-47bb-0310-9956-ffa450edef68
2013-02-24 22:42:09 +00:00
Gary Tully fc519e186a fix up missing license files - our rat check friend
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1442984 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 14:27:03 +00:00
Hiram R. Chirino 15298cb1b4 Switch to proton snapshot to pick up fix /w link closing. Also make a link fail if the address is an empty string.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1438570 13f79535-47bb-0310-9956-ffa450edef68
2013-01-25 16:07:12 +00:00
Hiram R. Chirino 37423d661c When the AMQP source or target address is not set, close the sender/receiver and report the error.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1438540 13f79535-47bb-0310-9956-ffa450edef68
2013-01-25 14:35:18 +00:00
Hiram R. Chirino 0dfa5f483c Avoid logging error messages when an AMQP client gracefully disconnects.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1437550 13f79535-47bb-0310-9956-ffa450edef68
2013-01-23 16:36:37 +00:00
Hiram R. Chirino 77312e5a64 Fixes AMQ-4258: Endless loop when received incorrect AMQP message
Applied patch sumbitted by Robert Balent.  Many thanks!



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1437427 13f79535-47bb-0310-9956-ffa450edef68
2013-01-23 14:54:15 +00:00
Hiram R. Chirino ebaacfd4f6 Convert to new proton APIs.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1421487 13f79535-47bb-0310-9956-ffa450edef68
2012-12-13 20:20:53 +00:00
Hiram R. Chirino 8c5c33bfc2 AMQP: Clean up old commented code, pick up the trace setting from the transport filter.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1418089 13f79535-47bb-0310-9956-ffa450edef68
2012-12-06 21:22:21 +00:00
Hiram R. Chirino cbf2adb343 When we transform JMS to AMQP messages preserve destination type info.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1416516 13f79535-47bb-0310-9956-ffa450edef68
2012-12-03 13:43:22 +00:00
Hiram R. Chirino 3016b39249 Moved the JMS mapping logic into a proton module.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1414990 13f79535-47bb-0310-9956-ffa450edef68
2012-11-28 23:16:42 +00:00
Hiram R. Chirino 2727496c00 Support the no-local option over AMQP.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1412127 13f79535-47bb-0310-9956-ffa450edef68
2012-11-21 14:33:58 +00:00
Gary Tully badc1868bb fix compilation error in amqp module
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1411695 13f79535-47bb-0310-9956-ffa450edef68
2012-11-20 15:18:13 +00:00
Hiram R. Chirino cf70ce97ee make the protocol tracing configurable.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1409417 13f79535-47bb-0310-9956-ffa450edef68
2012-11-14 21:27:27 +00:00
Hiram R. Chirino 7a0c1f85ab Improve format of the amqp trace messages, implement better producer flow control.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1408953 13f79535-47bb-0310-9956-ffa450edef68
2012-11-13 20:52:18 +00:00
Hiram R. Chirino 914e177239 Use more sensible prefetch settings.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1408919 13f79535-47bb-0310-9956-ffa450edef68
2012-11-13 19:49:48 +00:00
Hiram R. Chirino 8387295ade Take the activemq-amqp module out of the ustable profile, include it in the default assembly.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1408918 13f79535-47bb-0310-9956-ffa450edef68
2012-11-13 19:49:39 +00:00
Hiram R. Chirino 11e0df8e04 Fixing up activemq-amqp build a bit.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1408917 13f79535-47bb-0310-9956-ffa450edef68
2012-11-13 19:49:23 +00:00
Hiram R. Chirino 9a8f6e415d Refactored the classes needed to run an ActiveMQ JMS client out from the activemq-core module to the activemq-client module.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406466 13f79535-47bb-0310-9956-ffa450edef68
2012-11-07 05:00:17 +00:00
Hiram R. Chirino ba0101882a Update Joram test suite so that it's easier to enable the tests that are working against QPID 0.19-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1405137 13f79535-47bb-0310-9956-ffa450edef68
2012-11-02 20:13:08 +00:00
Hiram R. Chirino ae24f5ff25 Fix bug where we were not properly draining all the links.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1404994 13f79535-47bb-0310-9956-ffa450edef68
2012-11-02 15:08:15 +00:00
Hiram R. Chirino 9a6a83fe0d Improved AMQP protocol support. All JORAM Selector tests are now working.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1404158 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 14:17:32 +00:00
Hiram R. Chirino 822c4f37cb Protect against a possible NPE in the selector handling logic.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1403753 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 15:56:20 +00:00
Hiram R. Chirino 3c9c147e76 Use the transformer default values for delivery mode, priority and ttl if not set on the amqp header.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1403752 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 15:56:13 +00:00
Hiram R. Chirino 8835535a94 Adding browser support.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1403690 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 13:31:15 +00:00
Hiram R. Chirino 3b0b1fa7da Temp queues verified to work now.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1403689 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 13:31:04 +00:00
Hiram R. Chirino 7806807db1 Fixes problem /w amqp impl of message acks.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1403459 13f79535-47bb-0310-9956-ffa450edef68
2012-10-29 18:41:44 +00:00
Hiram R. Chirino dc4ceb47e8 PLAIN Sasl is now working.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1402532 13f79535-47bb-0310-9956-ffa450edef68
2012-10-26 14:39:46 +00:00
Bosanac Dejan b8a6e5a6ca amqp - support configurable transformers and populate message properties for the default native one
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1402148 13f79535-47bb-0310-9956-ffa450edef68
2012-10-25 13:36:09 +00:00
Bosanac Dejan 2a0a0b66f6 initial amqp selector support
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1401674 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 13:32:32 +00:00
Timothy A. Bish 78265ea211 fix and test for: https://issues.apache.org/jira/browse/AMQ-4106
NIO based transports weren't updating the receive counter in the TcpTransport which can lead to the inactivity monitor mistakenly shutting down the connection.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1401394 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 19:13:19 +00:00
Timothy A. Bish 0fffe21720 fix for: https://issues.apache.org/jira/browse/AMQ-3996
Updates TransportServer API so that JaasDualAuthenticationBroker can tell when its dealing with a TransportServer that will provide SSL connections and it can validate client certificate chains from ConnectionInfo.  Also updated the properties files to reflect the newly generated certificates. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1400155 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 16:21:53 +00:00
Hiram R. Chirino 2db73e2b7e More AMQP impl changes. More tests pass, initial cut of transaction support is in.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1400116 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 14:28:02 +00:00
Hiram R. Chirino 6baed7a15a Fixin deadlock in amqp impl. Improved message mapping support and commented out the failing Joram test cases.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1394677 13f79535-47bb-0310-9956-ffa450edef68
2012-10-05 17:35:07 +00:00
Hiram R. Chirino 72d72ab79e AMQP: Sending and receiving large number of messages was broken.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1394266 13f79535-47bb-0310-9956-ffa450edef68
2012-10-04 21:00:36 +00:00
Hiram R. Chirino cac8c9c385 Improving the AQMP<-->JMS message mapping impl.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1394264 13f79535-47bb-0310-9956-ffa450edef68
2012-10-04 21:00:25 +00:00
Hiram R. Chirino e7137b7eae AMQP impl: A simple send and receive is now working
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1393790 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 22:01:08 +00:00
Hiram R. Chirino 7fe30bc0cc Making more progress on the AMQP implementation.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1393782 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 21:46:46 +00:00
Hiram R. Chirino cdd5150340 Initial rough cut of AMQP protocol support using the QPID proton project.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1393500 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 14:15:01 +00:00