summaryrefslogtreecommitdiff
path: root/java/broker/src
Commit message (Collapse)AuthorAgeFilesLines
* fix browser behaviour on deliverAsync(sub)Robert Godfrey2008-05-291-1/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@661405 13f79535-47bb-0310-9956-ffa450edef68
* Comments and changes from reviewRobert Godfrey2008-05-292-11/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@661395 13f79535-47bb-0310-9956-ffa450edef68
* Made subscription sendLock straight lock, re-enabled per subscription async ↵Robert Godfrey2008-05-294-19/+13
| | | | | | delivery git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@661325 13f79535-47bb-0310-9956-ffa450edef68
* Temp fix out of order issue with async(sub)Robert Godfrey2008-05-293-7/+16
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@661324 13f79535-47bb-0310-9956-ffa450edef68
* tidy upRobert Godfrey2008-05-291-48/+51
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@661296 13f79535-47bb-0310-9956-ffa450edef68
* Deliver async per subscription; not queueRobert Godfrey2008-05-291-7/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@661287 13f79535-47bb-0310-9956-ffa450edef68
* Avoid NPEs :-)Robert Godfrey2008-05-291-6/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@661286 13f79535-47bb-0310-9956-ffa450edef68
* Refactoring updates (job queue changes, enqueue collections..)Robert Godfrey2008-05-2712-156/+384
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@660490 13f79535-47bb-0310-9956-ffa450edef68
* Refactoring perf. tweaksRobert Godfrey2008-05-199-78/+125
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@657827 13f79535-47bb-0310-9956-ffa450edef68
* Fixed credit restoration, turned off biased write pool by default, removed ↵Robert Godfrey2008-05-153-17/+2
| | | | | | unused lock from queue git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@656849 13f79535-47bb-0310-9956-ffa450edef68
* Changes to MessageStore interfaceRobert Godfrey2008-05-137-24/+22
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@655798 13f79535-47bb-0310-9956-ffa450edef68
* Fixed broken exception overridingRobert Godfrey2008-05-131-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@655781 13f79535-47bb-0310-9956-ffa450edef68
* More fixing up of refactoring stuff; getting all maven tests passing and ↵Robert Godfrey2008-05-1211-53/+269
| | | | | | implementing management methods git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@655630 13f79535-47bb-0310-9956-ffa450edef68
* Copy over QPID-926Robert Godfrey2008-05-111-6/+24
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@655330 13f79535-47bb-0310-9956-ffa450edef68
* Copy over QPID-925Robert Godfrey2008-05-112-16/+30
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@655326 13f79535-47bb-0310-9956-ffa450edef68
* Updates on the refactoring workRobert Godfrey2008-05-1173-4057/+2542
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@655323 13f79535-47bb-0310-9956-ffa450edef68
* remove duplicate check of interest in enqueue, enable new Queue by defaultRobert Godfrey2008-04-212-15/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@650179 13f79535-47bb-0310-9956-ffa450edef68
* Initial checkpoint of queue refactoring workRobert Godfrey2008-04-21100-3680/+9431
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@650148 13f79535-47bb-0310-9956-ffa450edef68
* QPID-875 : Dropped logging level to debug.Martin Ritchie2008-03-241-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@640434 13f79535-47bb-0310-9956-ffa450edef68
* QPID-873 : Authentication Exception should be hard error; also NPE in ↵Robert Godfrey2008-03-241-2/+6
| | | | | | PropertiesPrincipalDatabase when user not known git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@640417 13f79535-47bb-0310-9956-ffa450edef68
* QPID-847 : Fixed this test for the selectorsMartin Ritchie2008-03-191-5/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@638951 13f79535-47bb-0310-9956-ffa450edef68
* QPID-858 : Added cancel to the housekeeping thread when the vhost is closed.Martin Ritchie2008-03-171-0/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@637991 13f79535-47bb-0310-9956-ffa450edef68
* QPID-847 : InvalidSelectorException. This was caused by the Broker now being ↵Martin Ritchie2008-03-171-3/+11
| | | | | | more AMQP spec compliant than previously. Reverted the change in AMQMinaProtocolSession.java that is causing the issue but we need to correctly fix this issue in the client as the client is not AMQP spec compliant, even with the STRICT_AMQP flag. Updated SelectorTest.java with an additional test so we don't have the functionality reversion later. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@637977 13f79535-47bb-0310-9956-ffa450edef68
* QPID-852 : Updated broker so that it closes consumers when there are no ↵Martin Ritchie2008-03-141-1/+10
| | | | | | messages on the queue git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@637067 13f79535-47bb-0310-9956-ffa450edef68
* QPID-852 : Updated broker so that it closes consumers when there are no ↵Martin Ritchie2008-03-143-9/+31
| | | | | | messages on the queue. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@637066 13f79535-47bb-0310-9956-ffa450edef68
* QPID-851 : Update to AMQChannel to prevent the memory leak when an autoclose ↵Martin Ritchie2008-03-141-8/+18
| | | | | | consumer closes in a second thread before the register gets a chance to add the new session to the map. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@637048 13f79535-47bb-0310-9956-ffa450edef68
* QPID-592 : Parameterised the Read/Write buffer limits. On the broker extra ↵Martin Ritchie2008-03-141-10/+13
| | | | | | config [read|write]BufferLimitSize on the client System properties qpid.[read|write].buffer.limit. All the defaults are 256k(262144). git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@637047 13f79535-47bb-0310-9956-ffa450edef68
* QPID-107 : Changes based on code review. Martin Ritchie2008-03-105-125/+30
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@635602 13f79535-47bb-0310-9956-ffa450edef68
* QIPD-841 : Problem with SimpleACLTest was that the ↵Martin Ritchie2008-03-102-13/+8
| | | | | | ConfigurationFilePrincipalDatabaseManager was looking up the ApplicationRegistry for the configuration. Most of the time this is ok but during test tearDown/startUp sometimes the config is null on lookup. This method is just wrong anyway. the ConfigurationFilePrincipalDatabaseManager setup is the only setup that looksup the configuration from the AppRegistry. So adjusted so that it takes it as a parameter as other classes do. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@635590 13f79535-47bb-0310-9956-ffa450edef68
* QPID-847 : SelectorParserTest with disabled testLike() Martin Ritchie2008-03-101-0/+130
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@635549 13f79535-47bb-0310-9956-ffa450edef68
* QPID-831 : Remove incorrect references to getDeliveredToConsumer()Robert Godfrey2008-03-041-20/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@633461 13f79535-47bb-0310-9956-ffa450edef68
* QPID-828 : Stop transient message data being cleared while still deliveringRobert Godfrey2008-03-032-5/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@633256 13f79535-47bb-0310-9956-ffa450edef68
* QPID-822 Set default to false for JMSXUserID.Martin Ritchie2008-02-281-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@632055 13f79535-47bb-0310-9956-ffa450edef68
* QPID-821 Set default to false for MultiIO and Buffer Limiting.Martin Ritchie2008-02-281-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@632054 13f79535-47bb-0310-9956-ffa450edef68
* QPID-818 : Persistent Pub/Sub can get exception on acking messageRobert Godfrey2008-02-283-22/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@631936 13f79535-47bb-0310-9956-ffa450edef68
* QPID-809 Updated logging and some whitespace changes.Martin Ritchie2008-02-251-12/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@630873 13f79535-47bb-0310-9956-ffa450edef68
* QPID-809 Updated logging and some whitespace changes.Martin Ritchie2008-02-252-10/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@630872 13f79535-47bb-0310-9956-ffa450edef68
* QPID-809 Updated logging and removed an unnecessary printStackTrace().Martin Ritchie2008-02-252-15/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@630865 13f79535-47bb-0310-9956-ffa450edef68
* QPID-107 : Initial ACL implementation for review. Implemented Permissions : ↵Martin Ritchie2008-02-2534-741/+1466
| | | | | | | | | | | | Consume, Create, Publish. The Permissions are configured via XML in a user friendly way. Sections for consume, create and publish are currently used to further define Access and Bind internally. Access is granted to all users that have some permission. Bind rights are given to users with Create rights. Full details of the ACL design will be posted on the wiki : http://cwiki.apache.org/qpid/qpid-design-access-control-lists.html git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@630854 13f79535-47bb-0310-9956-ffa450edef68
* QPID-810 : Moved check for closingChannels higher in stack and close channel ↵Martin Ritchie2008-02-251-23/+33
| | | | | | on any AMQException being thrown from the body.handle methods. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@630733 13f79535-47bb-0310-9956-ffa450edef68
* QPID-790 : Performance ImprovementsRobert Godfrey2008-02-223-21/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@630239 13f79535-47bb-0310-9956-ffa450edef68
* QPID-804 : Fix Java Broker Python test failuresRobert Godfrey2008-02-211-5/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@629981 13f79535-47bb-0310-9956-ffa450edef68
* QPID-790 : Performance ImprovementsRobert Godfrey2008-02-2122-310/+624
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@629731 13f79535-47bb-0310-9956-ffa450edef68
* QPID-800 : junit toolkit sources added.Rupert Smith2008-02-202-4/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@629518 13f79535-47bb-0310-9956-ffa450edef68
* QPID-790 : Performance ImprovementsRobert Godfrey2008-02-139-38/+86
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@627552 13f79535-47bb-0310-9956-ffa450edef68
* QPID-787 : Allow for quoting of identifiers in selectorsRobert Godfrey2008-02-121-0/+17
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@620858 13f79535-47bb-0310-9956-ffa450edef68
* QPID-588: change instances of trace() and isTraceEnabled to debug equivalent ↵Aidan Skinner2008-02-085-24/+24
| | | | | | to support older versions of log4j git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@619868 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 608477,609961,610475,610479,610806,611146 via svnmerge from Aidan Skinner2008-01-285-267/+360
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r608477 | rgodfrey | 2008-01-03 13:23:04 +0000 (Thu, 03 Jan 2008) | 1 line QPID-499 : Added per-virtual host timed tasks to inspect queues (with no consumers) for expired messages ........ r609961 | ritchiem | 2008-01-08 12:59:01 +0000 (Tue, 08 Jan 2008) | 2 lines QPID-499 : Patch to update the queue size statistics when the Active TTL process runs Removed old single commented out code line from AMQSession. ........ r610475 | ritchiem | 2008-01-09 17:32:43 +0000 (Wed, 09 Jan 2008) | 1 line Qpid-723 Added exec to qpid.start ........ r610479 | ritchiem | 2008-01-09 17:39:54 +0000 (Wed, 09 Jan 2008) | 1 line Qpid-690 : Provide configurable delay between re-connecion attempts. ........ r610806 | ritchiem | 2008-01-10 14:41:37 +0000 (Thu, 10 Jan 2008) | 1 line QPID-690 : Relaxed the timings on failover as Thread.sleep is accurate to 10ms so may finish the sleep 10ms early. Resulting in erratic failures as 9.9s < 10s. ........ r611146 | ritchiem | 2008-01-11 11:33:31 +0000 (Fri, 11 Jan 2008) | 1 line Patch by Aidan Skinner to make third constructor public. This is done so that the BDBMessageStore tests can still run with the addition of the VirtualHost reaper thread. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@615943 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions ↵Aidan Skinner2008-01-246-48/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 598285,598619,598721,598834-598835,599375,599531,599533,599572,599805,602134,604151,604928,605536,605542,606015-606016 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1 ........ r598285 | ritchiem | 2007-11-26 14:16:01 +0000 (Mon, 26 Nov 2007) | 3 lines QPID-92, QPID-564 : Upgraded Mina to 1.0.1 still not good enough but all future versions currently have a bug with the CumulativeProtocolDecoder. It compact()s the buffer which breaks slices. Added MultiThread Support which is some of the feature set of QPID-564 ........ r598619 | ritchiem | 2007-11-27 12:51:14 +0000 (Tue, 27 Nov 2007) | 1 line Renamed POMs to M2.1.1 Removed erroneous equals() in SpecificMethodFrameListenerTest ........ r598721 | ritchiem | 2007-11-27 18:09:33 +0000 (Tue, 27 Nov 2007) | 1 line QPID-621 : Patch Supplied by Aidan Skinner. Msg Ack after msg consumer is closed. ........ r598834 | ritchiem | 2007-11-28 00:45:32 +0000 (Wed, 28 Nov 2007) | 14 lines QPID-679 : Patch provided by Aidan Skinner and additional from odd problems during test runs. AMQChannel - Catch and log AMQException occuring when requeue()-ing. Previously exceptions wouldn't be caught at all. The requeue() is called during closure so there is nothing we can do protocol wise on error other than log the issue and continue with any other shutdown that is needed. AMQMinaProtocolSession & AMQPFastProtocolHandler . Additions to catch and log AMQExceptions. Changes to AMQMinaProtocolSession were done to ignore all input on a closing session other than the close-ok. Previously only Protocol frames were ignored this resulted in Content*Body-s still being processed. Additional checks were made for the MessageStoreClosedException to log and continue. As said else were we need to seperate protocol exceptoions(AMQException) from internal code exception handling. Further All AMQExceptions occuring in the frameReceived method are now caught and logged. Allowing them to propogate higher will only result in thread death. AMQPFastProtocolHandler Caught AMQExceptions occuring whilst closing the session. Again allowing these to continue will result in thread death. There is not a lot that can be done other than log the problem as the session is already closed by this point. Prevented the stacktrace associated with a session exception being printed in the exceptionCaught method when the problem was an IO Exception. This doesn't add anything useful and only adds to the log file sizes. ApplicationRegistry - Added removeAll option which ensures that all ARs are correctly purged so that we can attempt to clean up between Unit Tests. MemoryMessageStore - This was causing us real problems during the failover testing. Similar checks should probably be made to any other Message Store Impl. The issue was that when shutting down the broker the MS.close() method is called this sets all the storage to null. However, there may still be message processing going on as the close() does not attempt to stop connection processing. Hence we now check to see if the Store is close throwing a MSClosedException if required. This prevents NPEs that have been seen during Unit failover testing. In fact the close() is called as a request to shutdown the ApplicationRegistry, but this only occurs from tests and broker shutdown, no attempt to unbind or prevent further connections during this period is yet done. CLIENT CHANGES AMQConnection - Added method to check if failover is in progress. AMQClient - Upgraded acknowledge() exception to JMSException for errors due to failover. Also , added call to update consumers as a result of failover. BasicMessageConsumer - Changes to acquireReceiving to take in to consideration blocking for failover to occur. wrt receiveNoWait.. which previously blocked for failover to complete... not exactly noWait. acknowledge will now TransportConnection - Update to ensure all inVM brokers are correctly killed. FailoverTest - QPID-679 - Finder of all the above problems. ........ r598835 | ritchiem | 2007-11-28 01:01:05 +0000 (Wed, 28 Nov 2007) | 1 line CommitRollbackTest - this one just was never right.. now we have something better. ........ r599375 | ritchiem | 2007-11-29 10:58:08 +0000 (Thu, 29 Nov 2007) | 1 line Update to broker to address fanout python failure. ........ r599531 | ritchiem | 2007-11-29 17:56:12 +0000 (Thu, 29 Nov 2007) | 1 line QPID-92 QPID-564 Forgot to upgrade mina to 1.0.1 ........ r599533 | ritchiem | 2007-11-29 18:25:21 +0000 (Thu, 29 Nov 2007) | 1 line QPID-564 QPID-92 Tidied up a few points and fixed infinite loop in Read IO Thread ........ r599572 | ritchiem | 2007-11-29 20:56:22 +0000 (Thu, 29 Nov 2007) | 2 lines Mina Fix: Vm Pipe Starts Connection session before acceptor session. This results in protocol frames arriving before the protocol decoder has been configured on the InVM Broker. Verification of this could be done by adding a client side filter that delays the first message by a few seconds. ........ r599805 | ritchiem | 2007-11-30 12:47:08 +0000 (Fri, 30 Nov 2007) | 1 line Added new simple Request/Repsonse code as my last commit here seems to have missed the actual code. ........ r602134 | rupertlssmith | 2007-12-07 16:00:14 +0000 (Fri, 07 Dec 2007) | 1 line Added JDNI config for two broker, failover setup for failover tests. Also passed into FT tests config. ........ r604151 | ritchiem | 2007-12-14 10:40:37 +0000 (Fri, 14 Dec 2007) | 2 lines QPID-707 : Added new test to check message count on broker as messages are consumed to ensure that an ack is sent at 5000 mgs. Added acks on message consumer closure. Augmented VMTestCase to have helper methods for accessing broker statistics. ........ r604928 | rupertlssmith | 2007-12-17 17:00:10 +0000 (Mon, 17 Dec 2007) | 1 line DUPS_OK mode set to be same as AUTO_ACK, fixed broken dups ok test. ........ r605536 | rupertlssmith | 2007-12-19 13:40:05 +0000 (Wed, 19 Dec 2007) | 1 line Messages were being sent mandatory by default, set to false. ........ r605542 | rupertlssmith | 2007-12-19 13:53:44 +0000 (Wed, 19 Dec 2007) | 1 line Changed test configs to use colons instead of commas. ........ r606015 | rgodfrey | 2007-12-20 20:08:01 +0000 (Thu, 20 Dec 2007) | 2 lines QPID-714 : (Patch from Aidan Skinner) Issue with competing, transactional/client-ack consumers Ack each individual message on commit, not use multiple acks ........ r606016 | rgodfrey | 2007-12-20 20:12:25 +0000 (Thu, 20 Dec 2007) | 2 lines QPID-714 : (Patch from Aidan Skinner) Issue with competing, transactional/client-ack consumers Ack each individual message on commit, not use multiple acks ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@614906 13f79535-47bb-0310-9956-ffa450edef68
* QPID-746 : Used the parameter pased to setRedelivered() : fixed as per JIRAMartin Ritchie2008-01-181-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@613153 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status