summaryrefslogtreecommitdiff
path: root/java/broker/src/test/java/org/apache/qpid
Commit message (Collapse)AuthorAgeFilesLines
* Update from trunk r1375509 through r1450773asyncstoreKim van der Riet2013-02-28117-5811/+7565
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3858: Updated code to include recent refactoring by Gordon (gsim) - see ↵Kim van der Riet2012-08-271-9/+63
| | | | | | QPID-4178. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1377715 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3858: Updated branch - merged from trunk r.1368650Kim van der Riet2012-08-0354-2838/+2879
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1368910 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3858: Updated branch - merged from trunk r.1333987Kim van der Riet2012-05-0445-579/+1541
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1334037 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3855: only increment activeConsumerCount during registration if the ↵Robert Gemmell2012-02-192-1/+63
| | | | | | subscription is active. Add unit test to identify the issue and check behaviour following various state change notifications. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1291026 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3840: added automated tests for the Java Broker's qpid-passwd script ↵Keith Wall2012-02-151-0/+38
| | | | | | | | and Passwd class Applied patch from Andrew MacBean <andymacbean@gmail.com> and Philip Harvey <phil@philharveyonline.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1244406 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3842: Java Broker should report platform and memory size on startupKeith Wall2012-02-141-1/+32
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1244276 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3816: add client version to connection open loggingRobert Gemmell2012-02-062-13/+46
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1241257 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: remove factory method only used by testRobert Gemmell2012-02-061-2/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1240866 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3813: allow configuring the default version reply to an unsupported ↵Robert Gemmell2012-02-041-1/+21
| | | | | | protocol version initiation git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1240644 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3794: calculate a sleep interval to account for previous overlsleep, to ↵Robert Gemmell2012-02-041-1/+6
| | | | | | | | | help avoid ocasional failures in StatisticsCounterTest.testPeakOutOfOrder Applied patch from Oleksandr Rudyy <orudyy@gmail.com> (with small update to prevent a negative value being used) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1240518 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3802: Broker command line processing --help (-h) and --version (-v) no ↵Keith Wall2012-02-021-0/+22
| | | | | | | | longer work Applied patch from Andrew MacBean <andymacbean@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1239759 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3801 : [Java] Move JMS Selector code into commonRobert Godfrey2012-02-021-3/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1239643 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3800: add the ability to disable particular protocol versions ↵Robert Gemmell2012-02-021-0/+52
| | | | | | broker-wide to save having to exclude them from individual ports git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1239579 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java Broker] Remove duplication between two password file ↵Robert Godfrey2012-02-012-31/+21
| | | | | | database implementations git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1239112 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] Remove duplication of output converters and optimise ↵Robert Godfrey2012-01-301-1/+1
| | | | | | startup time git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1237772 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] Remove dead code and empty directoriesRobert Godfrey2012-01-301-88/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1237612 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3739: Java properties qpid.ssl.keyStoreCertType and ↵Keith Wall2012-01-291-4/+13
| | | | | | | | | | | | | | | 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/qpid@1237504 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3788: Remove remaining MINA configuration keys (and those from other ↵Keith Wall2012-01-281-13/+0
| | | | | | | | | | 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/qpid@1237088 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Encapsulate fields, use private members and accesors (keep ↵Robert Godfrey2012-01-2724-91/+80
| | | | | | checkstyle happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1236867 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Ensure all control flow statements use braces (keeping CheckStyle ↵Robert Godfrey2012-01-271-2/+6
| | | | | | happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1236647 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA : [Java] Tidy up import statements across the codebase, remove ↵Robert Godfrey2012-01-2785-315/+324
| | | | | | unused/redundant imports (keep Checkstyle happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1236638 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3697: SortedQueue synchronisation can cause deadlockKeith Wall2012-01-132-0/+38
| | | | | | | 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/qpid@1231095 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3730: remove ReadWriteJobQueue, it is no longer necessary as the only ↵Robert Gemmell2012-01-091-13/+0
| | | | | | things now using the thread pool are write jobs, so there is no need/benefit to request it be write-biased. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1229112 13f79535-47bb-0310-9956-ffa450edef68
* QPID-946 , QPID-2379 : QMF and Federation fixes (now works again with ↵Robert Godfrey2012-01-071-0/+6
| | | | | | qpid-config, qpid-route, qpid-tool) and store (durable) routes in the DB git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1228748 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3720 : [Java Broker] Implement Message GroupingRobert Godfrey2012-01-031-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1226930 13f79535-47bb-0310-9956-ffa450edef68
* QPID-464 : Set the default uncaught exception handler to abruptly terminate ↵Robert Godfrey2012-01-022-26/+27
| | | | | | | | the JVM (Note this commit also contains fixes for CurrentActorTest as it was discovered that this test was throwing uncaught exceptions from created Threads - i.e. not the main test thread) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1226557 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3713 : Implement producer side flow control for 0-10 in Java BrokerRobert Godfrey2012-01-021-2/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1226382 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3714 : [Java] Performance ImprovementsRobert Godfrey2011-12-2817-225/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Persistence: Store message in same transaction as enqueue if possible Memory: Remove unnecessary (un)boxing Reduce unnecessary copying of message data Cache short strings Cache queues for a given routing key on an Exchange (0-9) Use a fixed size buffer for preparing frames to write out Other: Reduce calls to System.currentTimeMillis (0-10) Special case immutable RangeSets, in particular RangeSets of a single range/point (0-10) Special case delivery properties and message properties in headers (0-9) send commit-ok as soon as data committed to store Cache publishing access control queries (0-9) Optimised long and int typed values for FieldTables (0-9) Retain FieldTable encoded form (0-9) Cache queue and topic destinations git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1225178 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3698: remove unnecessary test - MessageStoreShutdownTestKeith Wall2011-12-201-81/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1221313 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3687 : Improve Java Broker performanceRobert Godfrey2011-12-154-20/+126
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1214760 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3680: Header exchange bindings not being created via JMX Management ConsoleKeith Wall2011-12-141-39/+77
| | | | | | Applied patch from Andrew MacBean <andymacbean@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1214206 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2243: 0-10 protocol connections do not have a matching JMX MBean to ↵Robert Gemmell2011-12-013-8/+386
| | | | | | | | allow management. 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/qpid@1209052 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3642,QPID-3643: Add Dead Letter Queue functionality for 0-8/0-9/0-9-1 ↵Keith Wall2011-11-289-29/+782
| | | | | | | | paths, fixes isBound methods on FanoutExchange Applied patch from Keith Wall <keith.wall@gmail.com>, Andrew MacBean <andymacbean@gmail.com> and Oleksandr Rudyy<orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1207029 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3641: ACLV2 Simplifications and Improvements for Java BrokerKeith Wall2011-11-241-0/+12
| | | | | | | | | | | | | Improvements and simplifications to ACL V2 for the Java Broker: 1) Removed 'EXECUTE' operation (we now just have ACCESS and UPDATE like C++ broker) 2) Enable users with management rights for a procedure to complete that procedure without matching AMQP rights (configurable) 3) Fix up system tests (make clearer, remove need for lots of support files) 4) Fix disparity in DENY_LOG and DENY-LOG values between brokers. 5) Get rid of transitive/expand permission rules Work from Robbie Gemmell and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1205782 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3559: SimpleDateFormat used in thread unsafe manner in JMX Managed ↵Keith Wall2011-11-201-84/+148
| | | | | | | | Queue interface. Resolved thread safe issue. Added supporting unit and system test. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1204296 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3622: Add Sorted Queue funtionalityKeith Wall2011-11-2016-271/+1019
| | | | | | 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/qpid@1204295 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: add missing licence headers to various files in the java treeRobert Gemmell2011-11-172-0/+40
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1203385 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2703: 0-8..0-9-1 Transaction rollback/recover does not restore consumer ↵Keith Wall2011-11-171-0/+4
| | | | | | | | | credit. This change restores consumer credit after rollback/recover by restoring credit on reciept of basic.reject from the consumer. This change is basically as QPID-2506, but with additional changes to avoid the 0-10 path. Work by Robbie Gemmell and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1203137 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3592: ensure that the 'used credit' values are decremented when message ↵Robert Gemmell2011-11-111-0/+63
| | | | | | transfer commands 'completed' following a message.stop command attempt to restore their credit (to no effect due to the 0 credit limit) when using 0-10 Window credit mode. Add unit test, and break CreditManager dependency on ServerMessages by passing the required size value rather than the message itself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1200801 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3490: creating queue via JMX now binds the queue to the default ↵Keith Wall2011-11-111-1/+15
| | | | | | | | exchange; prevented unregistration of the default exchange. Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1200790 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3518: Introduce client side ability to detect server side support.Keith Wall2011-11-091-5/+25
| | | | | | Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1199662 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3583: Update trunk version from 0.13 to 0.15Justin Ross2011-11-031-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1197304 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3570: update MessageTransferMessage and TransferMessageReference to use ↵Robert Gemmell2011-11-011-7/+3
| | | | | | the reference counting system, helping ensure that persisted 0-10 message [meta]data is removed from the store when dequeued from all queues instead of just being orphaned for cleanup during store recovery git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1195929 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3517: Inconsistent SSL configuration keys in Java Broker in config.xmlKeith Wall2011-10-161-12/+26
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1184882 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2672: Unroutable persistent messages should be immediately removed from ↵Keith Wall2011-09-151-1/+17
| | | | | | store. Added new operational logging message (EXH-1003 - Discarded Message) that reports when the Broker drops an unroutable message. Added new System Test. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1171079 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3486: Make connector server port used for JMX configurable.Keith Wall2011-09-143-21/+64
| | | | | | | Commited work from Andrew MacBean <andymacbean@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1170612 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2627 : Remove dependency on MINARobert Godfrey2011-09-093-18/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1167311 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3467: replace the 'connection id' with the Username of the logged in ↵Robert Gemmell2011-09-071-6/+38
| | | | | | | | user for the ManagementActor, since the value for the connection id was arrived at using an incorrect assumption that the id number in the thread name for a particular RMI thread is specific to a given JMX connection when it isnt. Applied patch from Oleksandr Rudyy <orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1166134 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3473 : Replace use of MINA IO with transport IO (joint work with Robbie ↵Robert Godfrey2011-09-071-1/+1
| | | | | | Gemmel) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1166069 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status