summaryrefslogtreecommitdiff
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
* QPID-2059 : Updated test to try and wait for the subscriber message to ↵Martin Ritchie2010-02-0519-97/+207
| | | | | | | | | | | | | | | | appear in the log file. QPID-2059 : One of the main causes of SubscriptionLoggingTest failing was that the aynchronous broker call preceding the log scraping would not always have time to complete the logging to file. So I have added a waitAndFindMessages method that will attempt to retreive the required string for a set period of time. If it is found then it will perform the findMessages as before. I have updated the LoggingTests to use this method first. This will ensure that we have a more sophoiticated wait that just adding Thread.sleep()s to the tests. QPID-2059 : Being even more explicit in some of the Logging tests as the previous update caused a sinle ExchangeLoggingTest failure. Updated tests where I can to explicitly wait for a message ID they are testing for. Then used a findMatches with the more general match. i.e. wait for QUE-1001 but find all QUE- messages. merged changes from 0.5.x r 906559,906459,905600 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@906898 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2346 : AcknowledgeAfterFailoverTest was putting more messages on the ↵Martin Ritchie2010-02-053-31/+49
| | | | | | | | | | | external broker than the testing AcknowledgeTest code was expecting. Additionally when run in the java-derby(persistent) case the unacknowledge messages were recovered when the broker was restarted. To address this the store of each broker is deleted when the it is stopped. To ensure that the persistent tests do not impact each other enabled the broker.clean.between.tests on the java-derby profile Merged change over from 0.5.x r901461 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@906895 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2370 : Committing patch to improve broker logging. This will not ↵Martin Ritchie2010-02-053-17/+55
| | | | | | | | | | | | | | cleanly apply to trunk due to IO changes. QPID-1084 : Committed change to prevent flow control threads being created/sent if the channel/session is closed or the state has acutally changed in the mean time. Wrapped .debug statements as per review feedback Merged and adapted these changes from 0.5.x r905592,905596,905605 The AMQMinaProtocolSession Changes were moved to the AMQProtocolEngine git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@906890 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2379: update the generated output dir to be consistent with its package ↵Robert Gemmell2010-02-051-1/+1
| | | | | | heirarchy git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@906888 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1535 : Update to FailoverMethodTest to address testNoFailover failures. ↵Martin Ritchie2010-02-051-4/+24
| | | | | | | | | Unable to locally reproduce failure so commiting to allow CI boxes to hammer result. As the broker shutdown can sometimes take a full 1s ensuring that we are notified in less time that 500ms is not going to work. Increased delay to 2s to ensure that we can confirm that we waited for less than that time when the connection is closed. This change was committed to 0.5.x branch a r905559 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@906872 13f79535-47bb-0310-9956-ffa450edef68
* Disabled the org.apache.qpid.management.wsdm.WsDmAdapterTestRajith Muditha Attapattu2010-02-041-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@906698 13f79535-47bb-0310-9956-ffa450edef68
* Removed the ClientProperties.java I added to a wrong package nameRajith Muditha Attapattu2010-02-032-143/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@906156 13f79535-47bb-0310-9956-ffa450edef68
* This is related to QPID-1831Rajith Muditha Attapattu2010-02-033-0/+366
| | | | | | | Contains helper classes for retrieving and holding information from a parsed address string git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@906145 13f79535-47bb-0310-9956-ffa450edef68
* This contains a test for QPID-1831 and import modifications as a result of ↵Rajith Muditha Attapattu2010-02-034-3/+354
| | | | | | the commit in rev 906135 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@906144 13f79535-47bb-0310-9956-ffa450edef68
* This is related to QPID-1831Rajith Muditha Attapattu2010-02-039-91/+632
| | | | | | | | I added the patch attached to the above JIRA with modifications. The modifications include integration with the address parser added by Rafi, and several refactoring and bug fixes to the original patch. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@906142 13f79535-47bb-0310-9956-ffa450edef68
* This is related to QPID-2343Rajith Muditha Attapattu2010-02-034-0/+562
| | | | | | | | Added the Accessor.java to abstract the access strategies. Added several acess strategies including one which takes a list of Accessors. Added a constrcutor in the QpidProperty class to take an Accessor. The other constructor defaults to SystemPropertyAccessor git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@906135 13f79535-47bb-0310-9956-ffa450edef68
* Added the property broker.languageRajith Muditha Attapattu2010-02-031-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@906099 13f79535-47bb-0310-9956-ffa450edef68
* The testing is failing on the c++ broker. Probably due to a slight ↵Rajith Muditha Attapattu2010-02-021-0/+2
| | | | | | | | | difference in semantics. I am temporarily disabling this test for the C++ broker test profiles. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@905491 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2379 : Updates to deal with changes to management specRobert Godfrey2010-01-312-0/+14
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@904940 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2379 : Initial work on adding QMF and federation to the Java BrokerRobert Godfrey2010-01-31188-2468/+14786
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@904934 13f79535-47bb-0310-9956-ffa450edef68
* Corrected a mistake I made in rev904375Rajith Muditha Attapattu2010-01-291-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@904566 13f79535-47bb-0310-9956-ffa450edef68
* added a null check for connection settingsRajith Muditha Attapattu2010-01-291-2/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@904375 13f79535-47bb-0310-9956-ffa450edef68
* moved pprint from JAddr into separate utility class and use it from Address ↵Rafael H. Schloming2010-01-283-112/+156
| | | | | | to implement a property toString git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@904162 13f79535-47bb-0310-9956-ffa450edef68
* Added a null check for connection as some test cases use mock sessions by ↵Rajith Muditha Attapattu2010-01-281-1/+1
| | | | | | passing null as the connection parameter git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@904126 13f79535-47bb-0310-9956-ffa450edef68
* This is related to QPID-2352Rajith Muditha Attapattu2010-01-284-1/+233
| | | | | | | The SASL encryption layer is not fully functional, however it's dormant unless explicitly enabled using the jvm arg "qpid.sasl_encryption" or the connection parameter "sasl_encryption". git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@903942 13f79535-47bb-0310-9956-ffa450edef68
* This is related to QPID-2363Rajith Muditha Attapattu2010-01-284-4/+27
| | | | | | | I added use_legacy_map_msg_format as a connection paramter to force the client to use the old map message format. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@903940 13f79535-47bb-0310-9956-ffa450edef68
* This commit contains the changes agreed upon in QPID-2363 except for the ↵Rajith Muditha Attapattu2010-01-286-108/+74
| | | | | | connection parameter which will be added shortly git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@903924 13f79535-47bb-0310-9956-ffa450edef68
* forgot to remove the unused boolean flagRajith Muditha Attapattu2010-01-281-1/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@903919 13f79535-47bb-0310-9956-ffa450edef68
* moving the logic of creating the map message to the AMQSession.java.Rajith Muditha Attapattu2010-01-281-16/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@903917 13f79535-47bb-0310-9956-ffa450edef68
* This is related to QPID-2363Rajith Muditha Attapattu2010-01-2710-21/+328
| | | | | | | | I am comitting the patch as it is. I will make the agreed changes in a subsequent commit shortly. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@903911 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2347 broke some java tests; I believe these make incorrect assumptions ↵Gordon Sim2010-01-223-6/+5
| | | | | | about durable subscriptions and have changed them accordingly. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@902231 13f79535-47bb-0310-9956-ffa450edef68
* added boolean literals to java & python address parser; added validation to ↵Rafael H. Schloming2010-01-222-1/+15
| | | | | | python address usage git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@902095 13f79535-47bb-0310-9956-ffa450edef68
* The commit contains fixes for QPID-2351, QPID-2350 and some ground work for ↵Rajith Muditha Attapattu2010-01-2113-93/+351
| | | | | | | | | | | | | | QPID-2352 - Modified Connection.java to add more than one ConnectionListener. This was done to facilitate the SASL encryption patch - QPID-2352. - Changed the access modifier for getSaslClient method to "public" to allow the SaslClient to be retrieved by the SASL encryption code -QPID-2352. - Introduced ConnectionSettings object to hold all the configuration options. Previous constructor methods remains unchanged. - Modified the ClientDelegate to handle heartbeat and idelTimeout value properly. - Added support to specify config options via the connection URL - QPID-2351 - Added support to handle the heartbeat/idle_timeout options properly in the 0-10 code - QPID-2350. However once QPID-2343 is completed, the code will be further simplified. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@901506 13f79535-47bb-0310-9956-ffa450edef68
* This is related to QPID-2350Rajith Muditha Attapattu2010-01-201-0/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@901448 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2349 : Fixed Protocol Version negotiation. The Negotiated protocol ↵Martin Ritchie2010-01-206-8/+19
| | | | | | | | | version was not given to the ProtocolSession. Once this is done the correct delegate is enabled on connection. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@901341 13f79535-47bb-0310-9956-ffa450edef68
* added java address parser (QPID-1831)Rafael H. Schloming2010-01-2011-0/+1239
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@901268 13f79535-47bb-0310-9956-ffa450edef68
* fixed generics warnings; added join methodRafael H. Schloming2010-01-201-2/+24
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@901267 13f79535-47bb-0310-9956-ffa450edef68
* Added detailed instructions for running the individual examples. ↵Jonathan Robie2010-01-201-1/+272
| | | | | | Instructions are taken from the MRG Messaging Tutorial. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@901241 13f79535-47bb-0310-9956-ffa450edef68
* This is related to QPID-2343Rajith Muditha Attapattu2010-01-192-2/+154
| | | | | | | | | I have added the basis for using a single config source for resolving property names. We could now add a set of new properties that follows the naming convention agreed on the list while providing support for old property names. Next step is to dig the code for all the properties and populate the correct tables in ClientProperties.java git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@901002 13f79535-47bb-0310-9956-ffa450edef68
* Changed the setIdleTimeout method to take an int instead of a long.Rajith Muditha Attapattu2010-01-1912-25/+23
| | | | | | | | The socket interface takes the so_timeout as an int and also the AMQP heartbeat interval is taken as an int. This change will help simplify the code that handles heartbeats. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@901000 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2262 : Removed SALCT from from exclude list and added required null check.Martin Ritchie2010-01-192-13/+35
| | | | | | | Updated references to QPID-1204 to QPID-2345 which talks more to the issue of setting exception cause when the connection is closed by the broker. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@900943 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1825 : Updated test to only start the 'clock' for timeout when the ↵Martin Ritchie2010-01-191-3/+14
| | | | | | message count on the queue hasn't changed after a 100ms sleep. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@900919 13f79535-47bb-0310-9956-ffa450edef68
* This is a first step towards QPID-2343Rajith Muditha Attapattu2010-01-187-7/+7
| | | | | | | | The common module also contains code for the client, and therefore contains configuration required for the client to be accessible from within the common module. Therefore the ClientProperties.java is best be placed inside the common module. The goal is to have a place holder for all configuration properties. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@900595 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2137 : Update QpidTestCase to set QPID_WORK on the external broker ↵Martin Ritchie2010-01-153-5/+8
| | | | | | based on the port of the running broker. This allows multiple brokers to be started by QTC with a given QPID_WORK value. Removed manual changing of QPID_WORK in FailoverBaseCase as there was no way to know what that value was later. All calls to startBroker in QTC will correctly append the port to the given QPID_WORK value. AcknowledgeOnMessageTest was updated to provide some extra debugging to help aid later investigation of why messages are not recieved after failover. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@899797 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1662 : Added logged to TimeToLiveTest. This showed that the second ↵Martin Ritchie2010-01-151-2/+8
| | | | | | | | | | message was not recieved and so the third was non-null and caused the test failure. Adjusting the timeout for msgs 1 and 2 to 5s helped ensure that they were correctly received. I've left the logging in so that we can see what the results of the three receives were even if it fails on one of the asserts. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@899782 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2340 : Fix ProducerFlowControlTest to call a synchronous operation ↵Robert Godfrey2010-01-141-0/+4
| | | | | | between sends (merged from 0.5-dev) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@899301 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2340 : Fix ProducerFlowControlTest to call a synchronous operation ↵Robert Godfrey2010-01-144-5/+19
| | | | | | between sends (merged from 0.5-dev) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@899296 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2137 : Add a test that creates log messages simultaneously in multiple ↵Martin Ritchie2010-01-131-3/+101
| | | | | | threads to validate the previous change. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@898953 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2137 : Update ot LogMessages velocity macro to create a new ↵Martin Ritchie2010-01-131-21/+16
| | | | | | MessageFormat for each log message as re-using a static formatter is not thread safe. The gap between applyPattern() and format() gives another thread the chance to change the pattern. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@898821 13f79535-47bb-0310-9956-ffa450edef68
* Added a null check for SASL client in the connectionOpenOk methodRajith Muditha Attapattu2010-01-131-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@898634 13f79535-47bb-0310-9956-ffa450edef68
* This is a fix for QPID-2339Rajith Muditha Attapattu2010-01-121-9/+28
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@898570 13f79535-47bb-0310-9956-ffa450edef68
* This is a fix for QPID-2174Rajith Muditha Attapattu2010-01-124-7/+70
| | | | | | | | I couldn't find any straight forward way to grab the proper ID from the SASL client. Therefore I had to use the java GSSAPI classes to create a security context to grab the ID. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@898505 13f79535-47bb-0310-9956-ffa450edef68
* This is a fix for QPID-2173Rajith Muditha Attapattu2010-01-111-2/+32
| | | | | | | | | The qpid.client_process could also be set to something more descriptive as follows using a jvm argument. -Dqpid.client_process="My Billing App" Currently added the prop names as plain strings. They will be moved to a single location as part of wider effort in organizing our configuration. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@897985 13f79535-47bb-0310-9956-ffa450edef68
* This is a fix for QPID-2336Rajith Muditha Attapattu2010-01-113-3/+16
| | | | | | | The fix allows an idle_timeout of zero to be set as the heartbeat interval with a warning message to say heartbeats are disabled. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@897922 13f79535-47bb-0310-9956-ffa450edef68
* There is mistake in a commit made for QPID-1830 in rev 891805Rajith Muditha Attapattu2010-01-081-2/+2
| | | | | | | | Due to the mistake a get operation could reference an index out of bounds or it could print fewer items than what is required. This commit corrects that mistake. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@897323 13f79535-47bb-0310-9956-ffa450edef68