summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* delete troublesome mergeinfojava-network-refactorAidan Skinner2009-10-140-0/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@825317 13f79535-47bb-0310-9956-ffa450edef68
* Merge from trunkAidan Skinner2009-10-1427-112/+568
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@825292 13f79535-47bb-0310-9956-ffa450edef68
* Merge from trunkAidan Skinner2009-10-11327-5807/+13050
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@824198 13f79535-47bb-0310-9956-ffa450edef68
* Fix bind error messageAidan Skinner2009-09-181-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@816614 13f79535-47bb-0310-9956-ffa450edef68
* MINANetworkDriverTest: Make sure we sleep for at least the alloted time.Aidan Skinner2009-09-181-16/+20
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@816613 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2104 AMQProtocolHandler: hand the actual write off to a seperate threadAidan Skinner2009-09-181-2/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@816612 13f79535-47bb-0310-9956-ffa450edef68
* Merge from trunkAidan Skinner2009-09-17198-2945/+4998
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@816261 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2024 QPID-2105: Remove now unnecessary classes like Event, PoolingFilter, Aidan Skinner2009-09-1711-1003/+113
| | | | | | | | | ReadWriteThreadModel. Move the couple of necessary methods to Job. Fix imports. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@816232 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2015: Remove AMQIoTransportProtocolSession. Release the executor ↵Aidan Skinner2009-09-164-150/+2
| | | | | | service in the same class as it's acquired git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@815729 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2105: Merging the patch didn't uncomment this test, stoopid git. Aidan Skinner2009-09-161-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@815708 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2106: Don't close connections if the broker has asked it to close andAidan Skinner2009-09-164-12/+40
| | | | | | | | | there's still stuff to process. Let the cleanup thread do that so that publishes which are denied don't result in instant connection death. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@815705 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2105: Make NetworkDriver.open use a SSLContextFactory, not an SSLEngine.Aidan Skinner2009-09-1624-487/+479
| | | | | | | | | | | | | | | | | | | | | | | Allow an existing SocketConnector to be passed into a MINANetworkDriver, for use with the ExistingSocket bit of TransportConnection. Move the ExistingSocket stuff to one place, use MINANetworkDriver in TransportConnection and make AMQProtocolHandler implement ProtocolEngine. Remove MINA specific gubbins from AMQProtocolHandler and AMQProtocolSession. Move fireAsynchEvent to Job Add getLocalAddress to AMQProtocolEngine Move TestNetworkDriver to common Use correct class for logger in AMQProtocolEngine Check the exception is thrown properly in SimpleACLTest, make it a little less prone to obscure race conditions. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@815704 13f79535-47bb-0310-9956-ffa450edef68
* Merge from trunk Aidan Skinner2009-09-09305-2023/+25729
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@812936 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2025: Log errors instead of printStackTracing()Aidan Skinner2009-09-042-3/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@811326 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2025: remove dead classesAidan Skinner2009-09-032-342/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@810953 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2025: Add a AMQProtocolEngine from the de-MINAfied ↵Aidan Skinner2009-09-0136-822/+1069
| | | | | | AMQMinaProtocolSession. Remove various now-unused classes and update references. Add tests for AMQDecoder. Net -1500 lines, +25% performance on transient messaging. Nice. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@810110 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2024: Change send to stash the future and have flush join on that so ↵Aidan Skinner2009-08-192-4/+16
| | | | | | | | | | that it only returns when all data has been written. Add getLocalAddress. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@805809 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2024: Add ProtocolEngine and NetworkDriver interfaces and a ↵Aidan Skinner2009-08-1810-22/+1124
| | | | | | NetworkDriver implementation that uses MINA. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@805477 13f79535-47bb-0310-9956-ffa450edef68
* Branch for doing network related stuff onAidan Skinner2009-08-180-0/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@805429 13f79535-47bb-0310-9956-ffa450edef68
* Clarified for users who do not run the Java broker on the same machineJonathan Robie2009-08-181-3/+4
| | | | | | | as client examples. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@805418 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2053: Allow queue names to be controlled for perftest (this allows ↵Gordon Sim2009-08-181-22/+31
| | | | | | multiple concurrent instances to be run). Based on a proposal and patch from Frantisek Reznicek. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@805404 13f79535-47bb-0310-9956-ffa450edef68
* This commit allows a limited number of failover tests to run under the SSL ↵Rajith Muditha Attapattu2009-08-185-20/+28
| | | | | | | | | | | | profile using SSL connections. This commit should also fix the tests hanging under the SSL test profile due to port conflicts with SSL and failover ports. FailoverBaseCase and FailoverTest is improved to handle the failover port without having to rely on port arithmetic. The FailoverBaseCase is modified to use the failover.ssl connection factory when running under the SSL profile. I have uncommented the FailoverTest from the cpp.ssl.excludes. However only a selected set of tests will run outside the cpp.clustered profile. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@805267 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2051: relax the parser validation to only halt startup on fatal-errors ↵Robert Gemmell2009-08-176-50/+97
| | | | | | in the xml file, and relax the level-check to allow undefined system properties. Move the Log4J initialisation override inside Main instead of the startup scripts, and have it check for -Dlog4j.configuration first before engaging. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@805188 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2056: ensure the table listeners are added to the new table when ↵Robert Gemmell2009-08-172-48/+56
| | | | | | changing the displayed attributes git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@805046 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1911, QPID-1912, QPID-1913: make SelectorTest, TopicSessionTest, ↵Aidan Skinner2009-08-175-38/+79
| | | | | | SelectorTest and SubscriptionLoggingTest all use transactions to stop intermittent timing related test failures. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@805021 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2055: update the save process for the log4j configuration file. Check ↵Robert Gemmell2009-08-171-5/+32
| | | | | | if the rename/move succeeds, and if not attempt a copy instead git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@805020 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2042: update the save process for the access rights file. Check if the ↵Robert Gemmell2009-08-171-5/+34
| | | | | | rename/move succeeds, and if not attempt a copy instead git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@805019 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2041: update the save process for the B64 MD5 password file. Only ↵Robert Gemmell2009-08-171-8/+38
| | | | | | attempt the move if the new file is created successfully. Check if the rename/move succeeds, and if not attempt a copy instead git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@805018 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2040: update the save process for the plain password file. Only attempt ↵Robert Gemmell2009-08-171-8/+39
| | | | | | the move if the new file is created successfully. Check if the rename/move succeeds, and if not attempt a copy instead git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@805017 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2040: add a copy method to FileUtils that throws checked exceptions ↵Robert Gemmell2009-08-171-18/+31
| | | | | | instead of wrapping as them runtime exceptions git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@805016 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1978: add some missed expansions of button text, dialog headings to pluralRobert Gemmell2009-08-172-4/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@805015 13f79535-47bb-0310-9956-ffa450edef68
* Ensured AlertingTest cleans up after its run. So we don't have to ant clean ↵Martin Ritchie2009-08-161-0/+9
| | | | | | between tests git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@804814 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2051, QPID-1975 : Add test to validate broker log4j startup does not ↵Martin Ritchie2009-08-161-0/+141
| | | | | | result in DEBUG logging git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@804813 13f79535-47bb-0310-9956-ffa450edef68
* Give QpidTestCase the ability to set environment variables for the external ↵Martin Ritchie2009-08-161-1/+28
| | | | | | brokers git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@804811 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2039: close the JMXConnectorServer down during shutdown of the ↵Robert Gemmell2009-08-161-9/+18
| | | | | | JMXManagedObjectRegistry git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@804781 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2052: Enable setting Loggers to inherit their Level from an ancestor. ↵Robert Gemmell2009-08-163-9/+118
| | | | | | Highlight the Runtime Loggers that have a level defined in the configuration file to aid inheritance visibility. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@804768 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2016: Add ability to reload the Log4J configuration file on request ↵Robert Gemmell2009-08-163-1/+87
| | | | | | using the management console git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@804767 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2051: Make the LoggingManagementMBean share the lock with ↵Robert Gemmell2009-08-162-313/+379
| | | | | | QpidLog4JConfigurator,protecting against concurrent access/modifications to the logging configuration file by JMX clients and the WatchDog thread. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@804766 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2051: Update startup scripts to disable the Log4J default ↵Robert Gemmell2009-08-166-54/+752
| | | | | | initialisation process. Add QpidLog4JConfigurator that validates the XML file before allowing it to be applied. Alter startup behaviour to shut the broker down if the specified log4j XML file is present present but invalid. Uses the -Damqj.logging.level(defaults to info) with the log4j.properties file in the broker jar if the XML file is not found. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@804765 13f79535-47bb-0310-9956-ffa450edef68
* Removed TSS variables that tracked I/O counts; not used. Part of fix for ↵Stephen D. Huston2009-08-141-17/+0
| | | | | | QPID-1868 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@804394 13f79535-47bb-0310-9956-ffa450edef68
* Initialize the update interval to a reasonable valueTed Ross2009-08-141-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@804386 13f79535-47bb-0310-9956-ffa450edef68
* Fixed regression (caused by Codec change) in the old management API.Ted Ross2009-08-143-15/+13
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@804363 13f79535-47bb-0310-9956-ffa450edef68
* Added documentation to watchdog plugin.Alan Conway2009-08-142-0/+25
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@804263 13f79535-47bb-0310-9956-ffa450edef68
* Revert "Batch multiple events into a single CPG multicast."Alan Conway2009-08-144-28/+17
| | | | | | | This reverts svn revision 803713: Batch multiple events into a single CPG multicast. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@804206 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2001 : Default Locale should be the VMs locale not en_US.Martin Ritchie2009-08-143-14/+22
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@804201 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2002 : Relax the SubscriptionLoggingTest.testSubscriptionSuspend. It ↵Martin Ritchie2009-08-141-5/+5
| | | | | | should only check the state not the Actor performing that state change. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@804199 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1971 - bind in fedOpReorigen mode is not threadsafe for TopicExchangeTed Ross2009-08-133-10/+159
| | | | | | | | Applied patch from Ken Giusti. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@803996 13f79535-47bb-0310-9956-ffa450edef68
* QTC: Removed nukeBroker() as it is not functionally different from stopBroker()Martin Ritchie2009-08-132-64/+34
| | | | | | Completely commented out tests in PST that are not possible. i.e. gracefull broker shutdown and the final test that did nothing other than leave 100 msgs on the queue. Also updated queue naming to use QTC.getTestQueueName() git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@803944 13f79535-47bb-0310-9956-ffa450edef68
* Check for null pointer in ~QueueCleaner.Alan Conway2009-08-131-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@803881 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2002: BLT should not be monitoring the qpid.log file it needs to ↵Martin Ritchie2009-08-131-9/+8
| | | | | | monitor standard out to validate that the correct BRK-1007 log4j configuration messages is provided. So reverted change to monitor qpid.log and refined comment git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@803851 13f79535-47bb-0310-9956-ffa450edef68