summaryrefslogtreecommitdiff
path: root/qpid/java
Commit message (Collapse)AuthorAgeFilesLines
* QPID-3789 : [Java] Remove duplication of BytesDataOutput inner class, and ↵Robert Godfrey2012-01-317-574/+378
| | | | | | shared code in SessionAdapt[eo]rs git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1238868 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3604 Moved the draining of consumer queues further down to be doneRajith Muditha Attapattu2012-01-311-8/+6
| | | | | | | after we drain the dispatch queue. Since the message flow is now stopped we can drain the queues without grabbing the message-delivery-lock. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1238688 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] Remove duplication of output converters and optimise ↵Robert Godfrey2012-01-308-913/+59
| | | | | | startup time git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237772 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] Remove dead code and empty directoriesRobert Godfrey2012-01-3012-598/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237612 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] Remove dead code and empty directoriesRobert Godfrey2012-01-308-1384/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237577 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3739: Java properties qpid.ssl.keyStoreCertType and ↵Keith Wall2012-01-2917-75/+349
| | | | | | | | | | | | | | | qpid.ssl.trustStoreCertType have misleading names and would be better called qpid.ssl.[Key|Trust]ManagerFactory.algorithm * Introduced two properties qpid.ssl.KeyManagerFactory.algorithm and qpid.ssl.TrustManagerFactory.algorithm to allow a client user to override the algorithm name used when Qpid client constructs a KeyManager or TrustManager. * Continued to support qpid.ssl.keyStoreCertType and qpid.ssl.trustStoreCertType (now marked as deprecated) * Introduced a new Java Broker configuration key connector/ssl/keyManagerFactoryAlgorithm * Continued to support broker configuration key connector/ssl/certType (now marked as deprecated and will issue warning if used). * Changed the default from hardcoded 'SunX509' to the value(s) returned by KeyManagerFactory#getDefaultAlgorithm() and TrustManagerFactory#getDefaultAlgorithm(). This allows the Java Broker and Client to be used out of the box on non-Sun JDKs without having to set qpid.ssl.KeyManagerFactory.algorithm or qpid.ssl.TrustManagerFactory.algorithm. * Updated client docbook documentation. Tested both Java Broker and Client on IBM JDK and ensured all 0-10 and 0-9-1 profiles pass (including SSLTest which was failing prior to this change). git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237504 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] fix regression caused by destination cache miss (by ↵Robert Godfrey2012-01-292-1/+7
| | | | | | further screwing with equality on AMQDestination) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237331 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] code tidyupsRobert Godfrey2012-01-29199-4624/+1098
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237273 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3788: Remove remaining MINA configuration keys (and those from other ↵Keith Wall2012-01-286-44/+6
| | | | | | | | | | retired impls) from the Java Broker's config.xml * Remove remaining references to MINA transport configuration keys: enableDirectBuffers/enablePooledAllocator/filterchain from code and example config files. * Remove references to compressBufferOnQueue from config XMLs. The implementation that used it was removed back in 2007 by QPID-275. * Remove references to broker-side configuration key enableJMSXUserID. This broker feature was removed by QPID-943 (which replaced the functionality with an equivilent client-side option). The old Broker side key plays no part in the client-side function. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237088 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3775: Fix path handling in bdb scripts.Keith Wall2012-01-282-8/+14
| | | | | | | Fix bdb scripts backup.sh and storeUpgrade.sh so they successfully handle QPID_HOME and store paths containing spaces. This problem was shown up on Jenkins, as the profile directories of the Jenkins Matrix contain spaces. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237029 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3775: Automate the manual persistent store tests.Keith Wall2012-01-2815-411/+590
| | | | | | | | | Add new testcase BDBBackupTest to test the operation of the BDB store backup mechanism (backup.sh). Changed test case PersistentStoreTest to implement the manually scripted BDB tests. This required changes to QBTC and BrokerHolder to allow an external Brokers to be forcibly kill'd with -9. Remove script and class for manual tests. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236931 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Encapsulate fields, use private members and accesors (keep ↵Robert Godfrey2012-01-27227-1269/+2074
| | | | | | checkstyle happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236867 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Ensure all control flow statements use braces (keeping CheckStyle ↵Robert Godfrey2012-01-2734-81/+360
| | | | | | happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236647 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA : [Java] Tidy up import statements across the codebase, remove ↵Robert Godfrey2012-01-27927-4533/+4515
| | | | | | unused/redundant imports (keep Checkstyle happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236638 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3559: AMQQueueMBean: Switched timestamp formatting to static ↵Keith Wall2012-01-261-18/+11
| | | | | | | | FastDateFormat instance to avoid the need for synchronisation or the generation of lots of SDF and Date instance garbage. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236397 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3786 Setting queueName, exchange and routingKey from informationRajith Muditha Attapattu2012-01-261-1/+15
| | | | | | given in the incomming message. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236355 13f79535-47bb-0310-9956-ffa450edef68
* QPID-946, QPID-2379 : code review - move statements inside try blockRobert Godfrey2012-01-261-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236332 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3265 This is not a fix for this issue, but rather a minor step towards it.Rajith Muditha Attapattu2012-01-261-4/+4
| | | | | | | | It's incorrect to add the binding for the temp queue to the bindings object as if the destination is used with another consumer it will interfere. Therefore the qeueu bind is sent explictly. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236198 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3783 The AddressParser will now set the subject to Null if it equals to ↵Rajith Muditha Attapattu2012-01-261-0/+4
| | | | | | | | | | None. The only drawback is that if somebody wants to use a subject called "None" which is hard to imagine :) However even if they want to use such a subject it will not be easy to distinguish due to the fact we print null subjects as None. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236196 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3779: replace the old ImmediateMessageTest and MandatoryMessageTest ↵Robert Gemmell2012-01-268-930/+213
| | | | | | | | with understandable versions and remove duplicate/obsolete tests FailoverTest and RollbackTest. Applied patch from Andrew MacBean <andymacbean@gmail.com> and Oleksandr Rudyy<orudyy@gmail.com>. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236127 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3604 Added a note on the exclude fileRajith Muditha Attapattu2012-01-251-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1235872 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3604 Excluded testConnectionStop method from 0-91 profile as theRajith Muditha Attapattu2012-01-251-0/+1
| | | | | | fix was only made to the 0-10 code path. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1235795 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3780 : [Java Broker] reduce scavenge overhead on large queuesRobert Godfrey2012-01-251-18/+26
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1235771 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3604 Added a test case to cover this issue.Rajith Muditha Attapattu2012-01-241-0/+39
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1235556 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3604 Added sync() after sending message stop for each subscriber.Rajith Muditha Attapattu2012-01-241-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1235553 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3604 Once message stop is issued for each subscriber, the clientRajith Muditha Attapattu2012-01-242-1/+93
| | | | | | | | | | now drains the internal queues of each subscriber. It also drains the dispatch queue. These messages are then released without marking them as redelivered. Messages that were given to the application but were not acked are also released, but are marked as redelivered. All messages received upto that point are marked as completed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1235550 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3774 : Work around Java BDB issue with cursors and flushLogRobert Godfrey2012-01-211-63/+25
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1234410 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3774 : allow out of order completion of persistent enqueues / dequeues ↵Robert Godfrey2012-01-2121-40/+148
| | | | | | (0-9 codepath) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1234215 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3774 : allow out of order completion of persistent enqueues / dequeuesRobert Godfrey2012-01-2010-101/+627
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1234111 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3768: Refactor test case to avoid possibility of spurious test failureKeith Wall2012-01-181-29/+39
| | | | | | Changed impl of testGetNextWithAck() to avoid unsafe assumption that pre-fetching will mean sorting will never occur. Remove unnecessary message payloads used by some test (time in ms) as this was not contributing to test. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1233125 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3688 Added a default constructor and allowed the destination string to ↵Rajith Muditha Attapattu2012-01-184-1/+34
| | | | | | be set and retrivied via a setter & getter. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232992 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3756: ManagedConnectionMBeanTest.testChannels occasionally fails on ↵Keith Wall2012-01-182-20/+38
| | | | | | | | | | | 0-10 spawned profiles This problem is caused by the connection mbean being deregistered too late (as the TCP/IP socket) is closed, thus creating a race between the client using JMX to observe connection state, and the unregistering of the bean. This patch changes the 0-10 code path to unregister the bean on receipt of ConnectionClose and before ConnectionCloseOkay is sent to the client. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232785 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3766 Committing a patch by Weston Price.Rajith Muditha Attapattu2012-01-171-12/+13
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232612 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3764 Committing a patch by Weston Price.Rajith Muditha Attapattu2012-01-173-6/+19
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232611 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3763 Committing a patch by Weston Price.Rajith Muditha Attapattu2012-01-171-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232605 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3720 : Fix issue with default group assignment pointed out by RobbieRobert Godfrey2012-01-161-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232058 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3762: make sure to close the IoSender when the IoReciever indicates the ↵Robert Gemmell2012-01-161-1/+8
| | | | | | TCP connection went away, fixes leak for forcefully clsoed 0-9-1 connections git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232032 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3761: rename the fallback config to ensure it isnt just picked up by ↵Robert Gemmell2012-01-164-8/+8
| | | | | | Log4J automatically scanning the classpath git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232031 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3720 : Reorder an ack in the test to prevent spurious failuresRobert Godfrey2012-01-161-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232022 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3758 : Reduce memory overhead of SessionsRobert Godfrey2012-01-131-40/+47
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1231141 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3697: SortedQueue synchronisation can cause deadlockKeith Wall2012-01-134-3/+86
| | | | | | | Sorted queue enqueue() should lock on a private rather than the lock of the object to avoid the possibility of a deadlock with a thread performing subscription operations. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1231095 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3747: Prefetch behaviour test occasionally fails on 0-10 profileKeith Wall2012-01-131-22/+28
| | | | | | Reorder the sequence of test to avoid the possibility that the 3rd message will go to the 'wrong' consumer. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1231094 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3753 : [Java Broker] Improve automatic conversion of messages between ↵Robert Godfrey2012-01-129-28/+417
| | | | | | 0-8/9/9-1 and 0-10 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1230661 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3635: Refactored testcase to make objectives more clearKeith Wall2012-01-128-359/+295
| | | | | | | | Move testPrefetchSystemProperty to PrefetchBehaviourTest for better division of responsibilities between tests. Split AMQConnectionTest into QueueSessionFactoryTest and TopicSessionFactoryTest. Removed AMQSSLConnectionTest as there is nothing transport specific and therefore added nothing not already tested by SSLTest. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1230477 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3720 : Fix bug which causes failure in 0-9-1 tests, namely ↵Robert Godfrey2012-01-111-3/+3
| | | | | | SimpleAMQQueue.QueueEntryListener assuming that all listeners are of the same type git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1230251 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3604 Reverting the changes as it releases messages everytime theRajith Muditha Attapattu2012-01-113-77/+9
| | | | | | channel is suspended. This results in several test failures. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1230088 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3720 : Remove debugging log statementsRobert Godfrey2012-01-111-3/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1230013 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3720 : Add alternative (C++ style) grouping and apply comments from ↵Robert Godfrey2012-01-116-209/+693
| | | | | | Robbie Gemmel git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1229996 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3736 : Upgrade to BDB version 5.0.34Robert Godfrey2012-01-114-5/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1229957 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3717 - Fixes based on review by Robbie GemmellRobert Godfrey2012-01-111-9/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1229943 13f79535-47bb-0310-9956-ffa450edef68