summaryrefslogtreecommitdiff
path: root/java/client/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
* QPID-3401 Checking the proposed changes into a branch to preserve history & ↵address-refactorRajith Muditha Attapattu2011-10-1438-1720/+2170
| | | | | | continue working until such time it's accepted into trunk. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/address-refactor@1183532 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3546: update the highestDeliveryTag marker during failover to prevent ↵Robert Gemmell2011-10-132-5/+39
| | | | | | | | | | the stale value being used to set the rollback mark on the first rollback after failover. This commit only fixes the 0-10 client path, as fixing this on the 0-8/9/9-1 path currently would cause undesirable interaction with the issue in QPID 3521. Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1182793 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3542: Java client does not ack non-matching messages when using client ↵Keith Wall2011-10-112-67/+45
| | | | | | | | side selectors (CPP Broker) Applied patch from Andrew MacBean <andymacbean@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1181861 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3534: ignore transport exceptions raised whilst closing the network ↵Robert Gemmell2011-10-111-1/+10
| | | | | | | | connection after sending the close-ok reply, as these can prevent failover occurring and are actually related to the broker (incorrectly) having already closed the socket Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1181735 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3534, QPID-3535: make 0-8/0-9/0-9-1 client path simply close the ↵Robert Gemmell2011-10-101-1/+1
| | | | | | | | | underlying NetworkConnection instead of sending an erroneous ConnectionClose body after replying to the ConnectionClose from the broker or receving an unsupported protocol verison during initial connection negotiation. Stops the client making 2 seperate attempts to initiate failover, and removes possibility of the exception that can currently cause both of them to be skipped. Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1181204 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3526: ensure that the session is marked clean after ↵Robert Gemmell2011-10-071-0/+1
| | | | | | message.acknowledge() is used, add test to verify behaviour git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1179965 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2442: Make 0-10 TemporaryQueue#delete and TemporaryTopic#delete perform ↵Keith Wall2011-10-065-16/+52
| | | | | | the delete on the Broker git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1179754 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3525: stop the client from accidentally consuming the messages it is ↵Robert Gemmell2011-10-061-12/+24
| | | | | | | | actually trying to recover when using 0-8/9/9-1. Also stops it acking the message from the in-progress onMessage delivery after Session.recover() was called. Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1179699 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3527: update handling of auto-ack messages for 0-10 to send acks ↵Robert Gemmell2011-10-066-80/+53
| | | | | | | | (asynchronously) on a per-message basis rather than batching for 1 second, update handling for other ack modes to be clearer with respect to 0-8/0-10 behavioural differences. Remove some redundant methods from AMQSession, updating handling of 'no consume'/'isBrowseOnly' such that BasicMessageConsumer is always supplied a single consistent answer for whether it is non-consuming or not. Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1179698 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3526, QPID-3524: make sure the 0-10 client message.acknowledge() ↵Robert Gemmell2011-10-066-165/+112
| | | | | | | | actually acknowledges messages immediately, and does so synchronously, adding test to verify behaviour. Split acknowledge() and commit() methods into version specific session implementations for clarity/reuse, align 0-10 and 0-8/9 transacted publishing behaviour, refactor preDeliver and postDeliver methods, remove dead code from consumers. Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1179695 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3526: move duplicated methods into the parent abstract message ↵Robert Gemmell2011-10-065-191/+72
| | | | | | | | delegate, remove dead code from BassicMessageConsumer Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1179694 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3512: Avoid race during 0-8..0-9-1 connection close.Keith Wall2011-09-305-34/+59
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1177689 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3511: Removal of unused system property "qpid.default_wait_on_send" ↵Keith Wall2011-09-289-97/+34
| | | | | | | | from Java Client. Applied patch from Andrew MacBean <andymacbean@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1176821 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3507: move the MessageListener check in front of the _receiving CASRobert Gemmell2011-09-271-4/+4
| | | | | | Applied patch from Oleksandr Rudyy<orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1176326 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3444: issue an invalid argument execution exception if the exchange ↵Robert Gemmell2011-09-251-1/+1
| | | | | | name is null or the empty string. Update some constants to ensure the error code is logged with the correct message git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1175625 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3466 Removed the extraneous toString()Rajith Muditha Attapattu2011-09-211-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1173693 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3415: Change 0-10 code path to utilise the CallbackHandlerRegistry to ↵Keith Wall2011-09-195-125/+365
| | | | | | create the correct CallbackHandler. The sasl_mechs property/broker option is retained, but continues to be understood only by the 0-10 path. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1172506 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3448: catch exceptions from the underlying Transport/Session/Connection ↵Robert Gemmell2011-09-137-48/+188
| | | | | | | | and rethrow as a JMSException like users are expecting Applied patch by Oleksandr Rudyy <orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1170182 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3428: make the Java broker validate 0-10 Session names, enabling it to ↵Robert Gemmell2011-09-134-8/+18
| | | | | | | | | satisfy the clients new ClientID verification feature. Misc updates to the clients verification process. Applied patch from Andrew MacBean git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1169982 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3449: adds ability to override the session timeout via JVM properties ↵Robert Gemmell2011-09-121-1/+4
| | | | | | | | qpid.sync_op_timeout and the legacy amqj.default_syncwrite_timeout, across all protocol versions Applied patch by Oleksandr Rudyy <orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1169773 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2627 : Remove dependency on MINARobert Godfrey2011-09-0926-1373/+1630
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1167311 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2901: fixes racing conditions on broker side when TopicDeletePolicy is ↵Robert Gemmell2011-09-071-1/+1
| | | | | | | | closing the consumer Session but the broker is trying to deliver next message to the Subscription of this closing Session. Applied patch from Oleksandr Rudyy <orudyy@gmail.com>. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1166246 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3473 : Replace use of MINA IO with transport IO (joint work with Robbie ↵Robert Godfrey2011-09-075-232/+74
| | | | | | Gemmel) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1166069 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3466 Removed the 'create:always' option when constructing theRajith Muditha Attapattu2011-09-061-1/+1
| | | | | | | | address string from the replyTo construct. The application which sets the replyTo is responsible for creating/deleting the replyTo destination and not the one who sends messages to it. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1165702 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3466 Added logic to convert exchange/replyTo pairs into addressRajith Muditha Attapattu2011-09-051-3/+58
| | | | | | strings. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1165148 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3461 The commit method implementation in AMQSession_0_10 nowRajith Muditha Attapattu2011-08-311-0/+7
| | | | | | handles the SessionException and throws a JMSException. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1163867 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3373 Applying Pavel's patch. I also added the same fix for theRajith Muditha Attapattu2011-08-311-23/+42
| | | | | | createXAConnection method with user,password. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1163457 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3395 Applied Pavel's patch with minor modifications.Rajith Muditha Attapattu2011-08-301-8/+13
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1163422 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3307: correct a couple style issues, add some basic unit testing for ↵Robert Gemmell2011-08-211-6/+4
| | | | | | ObjectMessage and the new CLAOIS git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1160002 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3307: attempt fall back to the ClassLoader which loaded the OIS when ↵Robert Gemmell2011-08-212-1/+138
| | | | | | | | | unable to load required classes during ObjectMessage deserialization process Applied patch from Charith Dhanushka Wickramarachchi based on the solution to this problem from the Apache ActiveMQ codebase. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1160001 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3434: Refactored 0-8..0-9-1 code paths to use same SSL configuration ↵Robert Gemmell2011-08-189-464/+133
| | | | | | | | mechanisms as 0-10. Apply work by myself and Keith Wall git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1159255 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3429: ensure that SSL is enabled correctly in MinaNetworkHandler. ↵Robert Gemmell2011-08-181-3/+12
| | | | | | | | Refactor SSLContextFactory to be a factory, and present a useful interface for both client and server side use. Added keystore for the Java broker, renamed existing client trust/key stores for clarity. Fix SSL port configuration. Added new SSL tests, and ensure these are *always* run in the Java 0-10 profiles. Committing work by myself and Keith Wall. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1159250 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3377 Applying patch from Pavel MoravecRajith Muditha Attapattu2011-08-021-5/+6
| | | | | | | QPID-3381 Changed the code to use QpidMessageProperties.QPID_SUBJECT instead of the string literal. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1153298 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3381 Provided the ability to retrieve the routing key from a JMS ↵Rajith Muditha Attapattu2011-08-021-2/+7
| | | | | | message using getStringProperty(). git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1153274 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3381 Added the class QpidMessageProperties as a place holder for Qpid ↵Rajith Muditha Attapattu2011-08-021-0/+34
| | | | | | specific properties, rather than using string literals all over the code. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1153272 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3263 Applying patch from Weston Price with the following modifications.Rajith Muditha Attapattu2011-08-023-8/+51
| | | | | | | | 1. The test case now extends QpidBrokerTestCase instead of TestCase to ensure that it can run under the automated ant builds. 2. Added an additional case to testIsSameRMMultiCF to ensure that isSameRM() returns false for two XAResources created from two different brokers. 3. Excluded this test from the Java test profiles. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1153164 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3358 Added a controller to coordinate tests run on several jvm's on the ↵Rajith Muditha Attapattu2011-07-201-1/+1
| | | | | | | | | | | | | | | | | same host or multiple host machines. 1. The controller registers participants and waits until the desired numbers of producers and consumers join the test. 2. It then coordinates warmup runs between the participants and starts the actual test run. 3. Once the test is done it collects stats and computes averages,max,minetc.. and prints them out. The collector is designed run by itself, but can be run inline with a producer for simplicity. Infact by default the producer will run a controller unless -Dext_controller=true is specified. This is done to ensure that the simple test cases like the per-report script can be run without additional configuration. The code would need a bit of cleanup later on. The current form was done quite quickly as a POC for an urgent task. I will be reviewing the code and making improvements over the comming days. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1148935 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3345: restore/add ability to use sys props to select the ↵Robert Gemmell2011-07-141-2/+2
| | | | | | | | NetworkTransport used to make/accept connections Applied patch by Keith Wall <keith.wall@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1146594 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3269Rajith Muditha Attapattu2011-07-086-26/+84
| | | | | | | | | | | In order to verify the uniqueness of the client ID, a dummy session is created using client ID as it's name. This prevents any other connection from using same client ID as the session creation will fail. However this verification is switched off by default in order to preserve backwards compatibility. You need to use -Dqpid.verify_client_id=true switch verification on. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1144531 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3343: refactor test profiles to allow testing within the same JVM for ↵Robert Gemmell2011-07-079-306/+7
| | | | | | | | all protocols, remove vm:// transport support and associated forked Mina classes Applied patch by Keith Wall and myself git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1143874 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3342: transition TCP based Mina transport for 0-8/0-9/0-9-1 protocols ↵Robert Gemmell2011-07-078-802/+60
| | | | | | | | over to new IO interface model Applied patch by Keith Wall and myself git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1143867 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3341: remove unused/dead transport code and accompanying implementation ↵Robert Gemmell2011-07-073-39/+4
| | | | | | | | classes Applied patch by Keith Wall and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1143865 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3302 You can now get and set the app-id in AMQP 0-10 message properties ↵Rajith Muditha Attapattu2011-06-281-1/+13
| | | | | | using "x-amqp-0-10.app-id". git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1140412 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3270 A new enumeration is created off a static list for eachRajith Muditha Attapattu2011-06-221-14/+15
| | | | | | invocation of asEnumeration(). git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1138296 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3270 The protocol version is now read from the Connection objectRajith Muditha Attapattu2011-06-221-4/+5
| | | | | | passed into when creating the ConnectionMetaData. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1138295 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3273 The JMS delivery mode is now used evaluated as a string instead of ↵Rajith Muditha Attapattu2011-06-201-5/+8
| | | | | | | | | | an integer. Added a test case to cover the JIRA. There was an existing test case (testUsingOnMessage) that had delivery mode in it's selector, but for some reason it was commented out. I decided to add a new one as I was not sure why the delivery mode was taken out of the selector in that test case. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1137804 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2158: add length validation into AMQShortString, remove dead code from ↵Robert Gemmell2011-06-071-107/+5
| | | | | | | | AMQDestinations, truncate exception messages with length over 255 before sending them over the wire in AMQChannelException and AMQConnectionException. Applied patch by Oleksandr Rudyy <orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1133037 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3277: AMQCallbackHandler improvements. Refactor AMQCallbackHandler to ↵Robert Gemmell2011-05-266-66/+53
| | | | | | | | accept ConnectionURL in place of AMQProtocolSession (improved information hiding, ease ability to write good unit tests). Remove unused protected constructor from AMQConnection and MockAMQConnection. Applied patch from Keith Wall <keith.wall@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1127939 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3254Rajith Muditha Attapattu2011-05-161-2/+2
| | | | | | | | | The default for routing key should be based on the context. i.e for sending it should be "" and for receiving it should be "#". However we currently don't have a way of handling this properly. Therefore defaulting it to "". git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1103884 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3220: Specifying connection url option failover='singlebroker' causes ↵Robert Gemmell2011-05-162-6/+5
| | | | | | | | | the wrong failover policy to be used. Wrote new unit test case and resolved the defect. Applied patch from Keith Wall <keith.wall@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1103857 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status