summaryrefslogtreecommitdiff
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
* QPID-2028 : Augment BrokerActor to allow the setting of the broker name. ↵Martin Ritchie2009-09-287-12/+21
| | | | | | Updated ApplicationRegistries to pass the instanceID to the BrokerActor in an attempt to better identify what brokers are shutting down during our test runs. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@819605 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2118, exclude SelectorTest#testSelectorWithJMSMessageID until it fails ↵Martin Ritchie2009-09-281-0/+3
| | | | | | in the same way as 0-8/9 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@819604 13f79535-47bb-0310-9956-ffa450edef68
* Set apache.commons logging to warn to reduce the amount of commons debug ↵Martin Ritchie2009-09-281-0/+4
| | | | | | that appears during Java broker test runs git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@819594 13f79535-47bb-0310-9956-ffa450edef68
* Add INDEX property to created messagesMartin Ritchie2009-09-281-2/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@819593 13f79535-47bb-0310-9956-ffa450edef68
* Improve error reporting when commit failedMartin Ritchie2009-09-281-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@819592 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1871 : Updated RollbackOrderTest to include an onMessage test. Fixed ↵Martin Ritchie2009-09-284-50/+191
| | | | | | | | deadlock issue with 0-10 rollback method and onMessage usage. Moved 0-10 rollback strategy to the abstract AMQSession and updated 0-8 to use that approach. 0-8 Still excluded from test runs as the race condition is not that the dispatcher would hold a message and reject after the TxRollback. The problem is the Java Broker sends a message out after the FlowOk message so the Dispatcher then sits on it, see QPID-2116. This exact problem was hidden due to the way the Dispatcher is stopped. This problem has not been addressed. The request to stop the dispatcher can only actually stop the dispatcher whilst it is in the middle of processing a message. The stop needs to interrupt the _queue.take() and hold the dispatcher AFTER the processing of any message that it needs to do: see QPID-2117. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@819590 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2115: add 'broker.clean.between.tests' to toggle whether QTC should ↵Robert Gemmell2009-09-252-0/+16
| | | | | | execute the 'broker.clean' command after every test method is run git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@818840 13f79535-47bb-0310-9956-ffa450edef68
* This is related to QPID-1956Rajith Muditha Attapattu2009-09-221-5/+5
| | | | | | | I had missed this bit when I committed last night. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@817867 13f79535-47bb-0310-9956-ffa450edef68
* This is a fix for QPID-1956Rajith Muditha Attapattu2009-09-221-2/+11
| | | | | | | | Added a check in the getNextBrokerDetails method to return null when the current broker equals the only remaining broker in the list A test case for this will be added once I finalized the test case for the failover exchange method git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@817487 13f79535-47bb-0310-9956-ffa450edef68
* This is a fix for QPID-2114 Rajith Muditha Attapattu2009-09-222-2/+4
| | | | | | | I have also added a simple check for the default message priority in an existing test in JMSPropertiesTest git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@817478 13f79535-47bb-0310-9956-ffa450edef68
* This is a fix for QPID-2113Rajith Muditha Attapattu2009-09-221-0/+36
| | | | | | | | | | | I didn't meddle with the existing log4j.properties file present in the common module as it maybe used in the broker. However a cursory glance at the etc directory revealed that the the broker too has a log4j.xml file. So perhaps the log4j.properties files in the common module is not really needed. (The settings given i the log4j.xml under the client module could be overriden by explicitly specifying a log4.xml file using -Dlog.configuration property) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@817457 13f79535-47bb-0310-9956-ffa450edef68
* FailoverBaseCase has not been using the testprofile defined test.port.alt ↵Martin Ritchie2009-09-213-5/+11
| | | | | | for the failover server. As a result the connection has been failing. Updated to use correct system property and added text to both default.testprofile and test-provider.properties to ensure that the changes are made in both locations, Ideally JNDI connection would use the same system property that is used by QTC for starting the broker. However I don't believe that it is currently doing that. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@817295 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2111 SelectorTest Unify selector tests into one class. AddAidan Skinner2009-09-182-314/+322
| | | | | | | testRuntimeSelectorError git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@816579 13f79535-47bb-0310-9956-ffa450edef68
* Update to QpidTestCase to only check for broker.stopped lines until we have ↵Martin Ritchie2009-09-173-3/+5
| | | | | | found the ready line. Added broker.stopped line to cpp.testprofile 'Exception constructed' this identifies port conflict issues. Local testing has shown that this works as expected. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@816150 13f79535-47bb-0310-9956-ffa450edef68
* Fix line endingsAidan Skinner2009-09-161-35/+35
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@815771 13f79535-47bb-0310-9956-ffa450edef68
* Reveted changes to QPID-2099, QPID-2100. The value of PNAME must not be changed.Martin Ritchie2009-09-153-15/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@815206 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2099 : Updated QTC now that QPID_PNAME will wrap its value QTC doesn't ↵Martin Ritchie2009-09-141-1/+1
| | | | | | need to do it aswell. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@814670 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2100 : Updated qpid.stop to use QPID_PNAME variable as the search. This ↵Martin Ritchie2009-09-141-4/+12
| | | | | | | | | | brings it in line with qpid-run. If QPID_PNAME is not set then it will fall back to QPID_STOP_SERVER so as to main backward compatibility. If neither are set then it will only use -DPNAME=" as the search. Thus allowing the value to have been changed and this script still to detect QPID processes. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@814545 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2099 : Updated qpid-run to use QPID_PNAME as the value for the system ↵Martin Ritchie2009-09-141-2/+2
| | | | | | | | property -DPNAME="". Ensured value is quoted to allow spaces in QPID_PNAME. i.e QPID_PNAME="Production Broker" git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@814544 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2002 : Update ManagementLoggingTest to cope with relative paths.Martin Ritchie2009-09-111-1/+1
| | | | | | Just check for the file name rather than the path. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@813856 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2093: Updated AMQBRokerManagerMBean to check if the queue is durable ↵Martin Ritchie2009-09-116-348/+701
| | | | | | | | | | | before performing store.deleteQueue(). Created ModelTest to validate the change, (testDeletionDurableViaJMX). To facility the testing, extracted JMX Operations from ManagementActorLoggingTest to a new JMXTestUtils and updated both ModelTest and MALT to use this interface. Updated 010(cpp) and 08(Java-InVM) excludes as the CPP does not have JMX and the InVM JMX is unreliable (see QPID-2097) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@813801 13f79535-47bb-0310-9956-ffa450edef68
* Add test customisation configuration to derby and acl configsMartin Ritchie2009-09-112-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@813799 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2094 : Check if _output is null, if so write test configuration to ↵Martin Ritchie2009-09-111-1/+2
| | | | | | java.io.tmpdir. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@813798 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2095 : Update QTC to set the management.jmxport configuration property ↵Martin Ritchie2009-09-111-0/+2
| | | | | | on InVM test cases git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@813797 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2096 : Add a work around which stops durable exchanges being written to ↵Martin Ritchie2009-09-111-0/+12
| | | | | | the message store. This will allow current DerbyStores to start up but will mean that the existence of the exchange in the configuration is its durability. Remove it from the config and it is gone. This differs from the way queues work. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@813796 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2092 : Corrected misspelling of SimpleMartin Ritchie2009-09-101-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@813476 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2092 Move test configuration to systest package and update to provide ↵Martin Ritchie2009-09-1023-709/+375
| | | | | | | | | | | | | | | an more reliable way of adjusting the configuration form the test. In doing this it made sense to udpate the configurations such that they all inherit from the cannonical config.xml from the broker package. Each test now gets its own configuration file that is used to override the defaut values in config.xml. So the config is now a hierarchy of: - Test Specific - Systest adjustments - stock broker config.xml I have disabled the DerbyMessageStoreLoggingTest as after making this change it is more reliably throwing a Derby exception on broker startup. The other changes to the tests were to ensure they correctly save the Test Specific config file before loading. As for some reason, Commons Configuration is not abiding by the optional flag. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@813461 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2091 : Updated ServerConfiguration and added test to ↵Martin Ritchie2009-09-104-175/+170
| | | | | | ServerConfigurationTest. Merged virtualhost.xml with config.xml git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@813459 13f79535-47bb-0310-9956-ffa450edef68
* Remove some more unused code.Aidan Skinner2009-09-092-19/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@812825 13f79535-47bb-0310-9956-ffa450edef68
* Remove unusued FirewallFactory classAidan Skinner2009-09-091-45/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@812821 13f79535-47bb-0310-9956-ffa450edef68
* QPID-155 : added java doc to testMartin Ritchie2009-09-071-0/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@812156 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1809, QPID-2081 : Corrected ChannelClose logic. Removed an unnecessary ↵Martin Ritchie2009-09-073-72/+111
| | | | | | sync on the failoverMutex in AMQSession that was causing the notification of the close to be blocked until a TimeOutException occured. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@812153 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2085 : Set append to true by default. Added QPID_LOG_APPEND variable to ↵Martin Ritchie2009-09-072-3/+8
| | | | | | control setting from the environment git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@812103 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2084,QPID-155 : Update excludes as 0-10 code path does not have same ↵Martin Ritchie2009-09-071-0/+6
| | | | | | error response git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@812083 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1809 : There is still a race condition between the notification and ↵Martin Ritchie2009-09-071-0/+17
| | | | | | main threads closing. The issue is ok as the main thread will not perform a syncWait, however, the set exception will be rethrown. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@812043 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2081, QPID-155 : Updated AMQSession to allow queue/exchange decare to ↵Martin Ritchie2009-09-063-10/+11
| | | | | | be set on a per session basis git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@811748 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2081, QPID-155 : Corrected error in package name in excludeMartin Ritchie2009-09-051-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@811725 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2081, QPID-155 : Provide a test for Dynamic Queue/Exchange toggling and ↵Martin Ritchie2009-09-043-2/+96
| | | | | | fixed the issue with ChannelCloseExceptions by closing the channel and not sending the ChannelClose when the Channel has already been closed by the broker. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@811472 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1809 - The incorrect expcetions were due to a race condition between ↵Martin Ritchie2009-09-0411-59/+133
| | | | | | | | the mina exception notification thread and the clients main thread blocking for a frame. Occasionally, the client will start blocking just after the notification and so will Timeout. This update ensures that blocking does not occur if the connection has been marked closing or is closed. The lastException set on the StateManager is thrown instead. The connection close also needed to take into consideration this fact. The syncWrite on for ChannelClose and ConnectionClose are now only down if we are not in a closing situation. As the 0-10 code path does not use the StateManager the changes were applied to the 0-8 Session. Further testing may be needed to validate that the 0-10 client code path does not also have this race condition. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@811471 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2002 : Add MNG-1003 messagesMartin Ritchie2009-09-041-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@811470 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1992 : Ensure StartupRootMessageLogger always logs messagesMartin Ritchie2009-09-041-0/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@811469 13f79535-47bb-0310-9956-ffa450edef68
* Add diagram of priority queue implementationAidan Skinner2009-09-021-0/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@810584 13f79535-47bb-0310-9956-ffa450edef68
* Add diagram of the broker queue and subscription model.Aidan Skinner2009-09-021-0/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@810538 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2059 : CI failures were due to threading races to exhaust prefetch ↵Martin Ritchie2009-09-021-19/+11
| | | | | | before delivered messages could be acked. So adjusted test to have the client dispatcher ready to deliver and relax the constraint that we validate which actor is doing the logging. The fact the state has changed correctly is the important factor. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@810441 13f79535-47bb-0310-9956-ffa450edef68
* CommitRollbackTest#testPutThenRollbackThenGet failed on CI. Using a 100ms ↵Martin Ritchie2009-09-011-1/+1
| | | | | | initial receive is to low as there will be no prefetched data to use. Increasing to 1000ms. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@810093 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2059 : Updated SLT to ensure there is a gap between ACTIVE and ↵Martin Ritchie2009-09-011-12/+20
| | | | | | SUSPENDING states so that the log can occur. As there are multiple threads editing the state of the subscripition it is possible that the state change does not result in a log message being produced. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@810072 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2077 : The problem with the tearDown is that we still have a race ↵Martin Ritchie2009-09-011-3/+25
| | | | | | | | condition when a control thread trys to close the connection at the same time as the exception handling thread is also closing the connection. Solution here is to wait for the exception handling thread to have done enough to mark the connnection closed so the race condition will not occur. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@809981 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2059 : Add some validation to verify suspension has been lifted correctly.Martin Ritchie2009-09-011-15/+18
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@809957 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2060 : Simplist solution is to remove test as the functionality is ↵Martin Ritchie2009-09-011-12/+0
| | | | | | better tested by the _Timeout test. This test verifies that the message is not in the file then waits for it ot occur. The _Found test is failing as we have not waited long enough for the message to be logged. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@809936 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2060: If the result set isn't the right size, try re-reading the log ↵Aidan Skinner2009-08-261-2/+4
| | | | | | file 10 times, just in case. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@807983 13f79535-47bb-0310-9956-ffa450edef68