Commit Graph

2753 Commits

Author SHA1 Message Date
Gary Tully dd1b847ad7 improve error reporting from classcast
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@773986 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 17:14:24 +00:00
Gary Tully 4b4ce4aaf2 resolve https://issues.apache.org/activemq/browse/AMQ-2246
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@773985 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 17:13:10 +00:00
Gary Tully 245771a14d test case for https://issues.apache.org/activemq/browse/AMQ-2233 with prefetch workaround
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@773862 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 11:31:04 +00:00
Bosanac Dejan 62e1abfb90 fix for https://issues.apache.org/activemq/browse/AMQ-2245 - broker restart
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@773569 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 14:15:58 +00:00
Bosanac Dejan 206df1bd57 test case for https://issues.apache.org/activemq/browse/AMQ-2195
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@772931 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 10:39:03 +00:00
Gary Tully 01e2aec7b5 resolve https://issues.apache.org/activemq/browse/AMQ-2241 - ensure default session is created for a duplicate connection request
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@771718 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 13:28:59 +00:00
Bosanac Dejan a49ba6c040 fix for https://issues.apache.org/activemq/browse/AMQ-2224 and additional fix for https://issues.apache.org/activemq/browse/AMQ-2221
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@768300 13f79535-47bb-0310-9956-ffa450edef68
2009-04-24 13:17:25 +00:00
Bosanac Dejan 82d7182939 fix for https://issues.apache.org/activemq/browse/AMQ-2221 - improvments for timestamp plugin
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@768219 13f79535-47bb-0310-9956-ffa450edef68
2009-04-24 08:27:10 +00:00
Bosanac Dejan 6fc95f5ce8 specifically add log4j.properties location, since surefire will ignore it if pertest fork mode is used
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@767849 13f79535-47bb-0310-9956-ffa450edef68
2009-04-23 08:27:55 +00:00
Gary Tully 047030447d give test some more time for slower machines
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@766639 13f79535-47bb-0310-9956-ffa450edef68
2009-04-20 10:18:31 +00:00
Gary Tully 4e0609f5cb resolve AMQ-2210|https://issues.apache.org/activemq/browse/AMQ-2210, in hindsight, it does not make sense to wait for dispatch in anycase as the message will always get replayed at some stage. an un dispatched ack is expected in this case so it is correct to ignore it. Revert wait from AMQ-2149|https://issues.apache.org/activemq/browse/AMQ-2149
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@765921 13f79535-47bb-0310-9956-ffa450edef68
2009-04-17 09:36:51 +00:00
Bosanac Dejan 4441fa7442 name unnamed timers
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@765212 13f79535-47bb-0310-9956-ffa450edef68
2009-04-15 14:25:07 +00:00
Bosanac Dejan e6790674dc fix for https://issues.apache.org/activemq/browse/AMQ-2209 - deleting queue does not remove messages
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@765141 13f79535-47bb-0310-9956-ffa450edef68
2009-04-15 11:37:45 +00:00
Gary Tully 0c89959c59 remove duplicate log info, AMQ-2198|https://issues.apache.org/activemq/browse/AMQ-2198
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@765133 13f79535-47bb-0310-9956-ffa450edef68
2009-04-15 11:01:29 +00:00
Bosanac Dejan ff59a598cc removing commons lang import statement
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@764403 13f79535-47bb-0310-9956-ffa450edef68
2009-04-13 10:57:44 +00:00
Bosanac Dejan 8f80e34292 additional fix for https://issues.apache.org/activemq/browse/AMQ-2086 - remove commons-lang dependency
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@764377 13f79535-47bb-0310-9956-ffa450edef68
2009-04-13 08:51:03 +00:00
Bosanac Dejan d185430ffe Fix for https://issues.apache.org/activemq/browse/AMQ-2086 - duplex connector and excluded destinations
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@763993 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 17:58:32 +00:00
Gary Tully 3da13732ec some additional tests for AMQ-2198|https://issues.apache.org/activemq/browse/AMQ-2198, also additional logging
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@763983 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 17:31:40 +00:00
Gary Tully 966658fdad resolve AMQ-2199|https://issues.apache.org/activemq/browse/AMQ-2199 add a latch for the event that initialises the localbrokerid and path
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@763565 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 09:05:17 +00:00
Gary Tully 5b8a886891 tidy up logging for network connectors, make debug level usefull
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@762996 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 22:16:53 +00:00
Gary Tully 5511217fb1 implement AMQ-2198|https://issues.apache.org/activemq/browse/AMQ-2198 add setSuppressDuplicateQueueSubscriptions option to Network configuration, when true, duplicate subs for the same consumer will be suppressed, relevant when networkTTL > 1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@762925 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 19:48:29 +00:00
Gary Tully 9f548bb74a ensure duplicate acks are send immediatly and supppress outstanding delivery acks on transport resumption, AMQ-2149|https://issues.apache.org/activemq/browse/AMQ-2149
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@762464 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 19:20:12 +00:00
Gary Tully 21cd3e69c6 tidy up logging
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@762287 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 11:32:33 +00:00
Gary Tully 1f4757b9d1 revert prefetch and maxPageSize to defaults to transaction tests, issue was negative inflight count due to duplicate acks, prefetch and max page size was a just a workaround that is not now needed AMQ-2149|https://issues.apache.org/activemq/browse/AMQ-2149
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@761610 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 10:57:40 +00:00
Gary Tully e45bb06907 further tests and fixes related to failover, this time transactions and topics. prefetch and maxPageSize are relevant in the transacted. With redeliveries the prefetch needs to be less than half the transaction size and the maxPageSize needs to exceed the transaction span. more tests in AMQ-2149|https://issues.apache.org/activemq/browse/AMQ-2149 and some amendments to the fixes for that issue
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@761597 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 10:16:28 +00:00
Bosanac Dejan f8ef7ff31f https://issues.apache.org/activemq/browse/AMQ-2195 - receive should throw an exception if the connection is lost
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@761301 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 14:03:54 +00:00
Gary Tully eab5a3a2e2 topic version of test case for AMQ-2149|https://issues.apache.org/activemq/browse/AMQ-2149 with associated fixes to suppress duplicates and out of order messages
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@760721 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 23:10:04 +00:00
Gary Tully c8e518b2dc fix duplicate detection of messages recovered when space limit is reached and fix cursor cache reenablement when free space becomes available, AMQ-2149
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@760075 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 18:04:20 +00:00
Gary Tully b896467146 make single ack id visible
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@759125 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 13:02:36 +00:00
Gary Tully 24dced675c add some redirection to the deprecated method
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@758908 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 22:49:46 +00:00
Gary Tully 9a0de1ccaf exercise the features of AMQ-2168|https://issues.apache.org/activemq/browse/AMQ-2168 enhanced LoggingBrokerPlugin
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@758779 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 18:08:01 +00:00
Gary Tully 681d149ffd apply patch from AMQ-2168|https://issues.apache.org/activemq/browse/AMQ-2168 enhanced LoggingBrokerPlugin
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@758777 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 18:00:43 +00:00
Gary Tully 84dbbc758b patch applied with thanks: AMQ-2178|https://issues.apache.org/activemq/browse/AMQ-2178
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@758721 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 16:27:35 +00:00
Gary Tully 132f662209 resolve AMQ-2149|https://issues.apache.org/activemq/browse/AMQ-2149 - isses with kaha reference store and duplicate messages, recovery of duplicaes and recovery with memory limits and session duplicate acks resulting in out of order message dispatch, more detail in the jira and test case
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@758678 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 15:22:57 +00:00
Gary Tully 31c7e620c2 add waitUntilStarted to broker service so it is possible to wait till recovery is complete
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@758268 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 14:30:50 +00:00
Gary Tully fb9a292be1 share the test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@758200 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 10:17:45 +00:00
Bosanac Dejan 42d91a3b79 fix for https://issues.apache.org/activemq/browse/AMQ-2179; xpath selectors and boolean expressions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@758184 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 09:12:52 +00:00
Gary Tully 86ec0553c5 further tests for AMQ-2149
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@756469 13f79535-47bb-0310-9956-ffa450edef68
2009-03-20 14:06:45 +00:00
Gary Tully 08aecbee6e partial fix for AMQ2149|http://issues.apache.org/activemq/browse/AMQ-2149 , contention when usage limit reached can lead to out or order mesage dispatch
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@755715 13f79535-47bb-0310-9956-ffa450edef68
2009-03-18 19:49:39 +00:00
Gary Tully 7b16aec2c0 apply patch from https://issues.apache.org/activemq/browse/AMQ-2154, with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@754973 13f79535-47bb-0310-9956-ffa450edef68
2009-03-16 18:22:41 +00:00
Hiram R. Chirino 6e989edaa1 The useInactivityMonitor option can now be used to disable configuring a inactivity montior on the transport.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@754963 13f79535-47bb-0310-9956-ffa450edef68
2009-03-16 17:22:40 +00:00
Hiram R. Chirino b41e1a7579 Making handly CONSTANT public
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@754962 13f79535-47bb-0310-9956-ffa450edef68
2009-03-16 17:21:45 +00:00
Hiram R. Chirino 95ff01053a Allow the negociation protocol to be used when not inserted as a transport filter.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@754959 13f79535-47bb-0310-9956-ffa450edef68
2009-03-16 17:13:20 +00:00
Gary Tully 3b06e128f9 resolve: AMQ-2144|https://issues.apache.org/activemq/browse/AMQ-2144 - patch applied with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@753297 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 15:18:27 +00:00
Bosanac Dejan 2a58f4c3a2 fix for https://issues.apache.org/activemq/browse/AMQ-2160
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@753222 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 12:33:18 +00:00
Gary Tully a91f59a201 resolve AMQ-2153|https://issues.apache.org/activemq/browse/AMQ-2153
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@753221 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 12:29:23 +00:00
Gary Tully f9d5449f47 resolve AMQ-2102|https://issues.apache.org/activemq/browse/AMQ-2102 - refactor message dispatch on slave to take account of subscription choice on the master, this ensures slave is in sync w.r.t outstanding acks. processDispatchNotification imoplemented by Queue type destinations which delegates to subscription after doing a dispatch, test demonstrates slve out of sync errors
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@753214 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 11:59:08 +00:00
Gary Tully 6d9163af39 seems to hang on slow HP box, ensure it does not stop rest of the tests using autoFailSupport
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@750885 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 13:20:50 +00:00
Gary Tully c7b48c4757 little more info in exception
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@750537 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 18:25:59 +00:00
Gary Tully b56cb8f3e2 AMQ-2094. fix break of org.apache.activemq.transport.tcp.SslContextNBrokerServiceTest where localhost and host name resolve to different interfaces as now the broker just listens on one interface unless ip:0.0.0.0 is used. The connectorUri did nore reflect the socket
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@750532 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 18:16:13 +00:00
Gary Tully 212a7904a9 fix AMQ-2102, apply patch from ying with test from dan, the test shows stack traces on console re slave out of sync, patch resolved this
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@750455 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 13:25:44 +00:00
David Jencks 563ec4433a AMQ-2094 Apply patch to allow binding to specific IP address
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@749464 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 23:07:22 +00:00
Gary Tully d98ea376ba resolve mem leak in kahadb - AMQ-2143
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@748218 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 17:32:37 +00:00
Bosanac Dejan 337962273d typo fix for https://issues.apache.org/activemq/browse/AMQ-1859
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@748205 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 16:42:22 +00:00
Bosanac Dejan f54713a7b3 fix for https://issues.apache.org/activemq/browse/AMQ-1859
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@748204 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 16:39:40 +00:00
Gary Tully 8e6446ffcd resolve AMQ-2123, deal with the topic dispatch case where a subscription arrives between store of message and dispatch of message
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@747951 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 23:03:10 +00:00
Bosanac Dejan 0a5ae2b68e additional fix for https://issues.apache.org/activemq/browse/AMQ-2074
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@747391 13f79535-47bb-0310-9956-ffa450edef68
2009-02-24 14:18:29 +00:00
Gary Tully 9d9d4cd69d apply patch from AMQ-2109, with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@747384 13f79535-47bb-0310-9956-ffa450edef68
2009-02-24 14:05:28 +00:00
Bosanac Dejan 2de531cb52 fix for https://issues.apache.org/activemq/browse/AMQ-2074
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@747030 13f79535-47bb-0310-9956-ffa450edef68
2009-02-23 14:36:03 +00:00
James Strachan e24a791f6e Fix for AMQ-2130 to upgrade to Camel 2.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@746263 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 14:52:36 +00:00
Gary Tully ae2a3e2182 a little more time for slow networks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@746191 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 10:09:23 +00:00
Gary Tully 184761a119 tidy up redispatch logic a little more, resolve: AMQ-2128, deliver acks on dispose in auto_ack mode. also get some closure on: MQ-2075
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@745953 13f79535-47bb-0310-9956-ffa450edef68
2009-02-19 18:15:59 +00:00
Bosanac Dejan 76d9fccb2d additional fix for https://issues.apache.org/activemq/browse/AMQ-2085
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@745833 13f79535-47bb-0310-9956-ffa450edef68
2009-02-19 12:09:21 +00:00
Bosanac Dejan 8b0bb3373a additional fix for https://issues.apache.org/activemq/browse/AMQ-2104 and https://issues.apache.org/activemq/browse/AMQ-1509
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@745558 13f79535-47bb-0310-9956-ffa450edef68
2009-02-18 16:24:56 +00:00
Gary Tully 9e3e5ad4cc re AMQ-2076, see if a little more time will help
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@745490 13f79535-47bb-0310-9956-ffa450edef68
2009-02-18 12:15:58 +00:00
Gary Tully 7f5e6667f4 partial fix for AMQ-2075
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@745480 13f79535-47bb-0310-9956-ffa450edef68
2009-02-18 11:43:29 +00:00
Gary Tully 9216c18c73 little refactor of recovery dispatch as now only used for browser dispatch
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@745456 13f79535-47bb-0310-9956-ffa450edef68
2009-02-18 09:44:31 +00:00
Bosanac Dejan 9ad6c089fa fix for https://issues.apache.org/activemq/browse/AMQ-2120
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@745031 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 12:56:24 +00:00
Gary Tully e48ff70d4b resolve AMQ-2111, only the network subscription that causes the initial subscription needs to be tracked as this is the one that will be propagated via an advisory to the rest of the network. The existing update was making a mod to a possibly inflight advisory message
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@744983 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 12:04:57 +00:00
Gary Tully 9f8777d3a0 resolve AMQ-2121, shared lock needs to be less contentious
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@744975 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 11:57:23 +00:00
Gary Tully b4aa979d90 fix intermittent failure when sync close beats async ack
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@744972 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 11:55:53 +00:00
Bosanac Dejan b0eb9731c0 two consumers test for zero prefetch
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@744947 13f79535-47bb-0310-9956-ffa450edef68
2009-02-16 15:54:04 +00:00
Bosanac Dejan 32d6841a13 A few more failover transport uri test combinations
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@744870 13f79535-47bb-0310-9956-ffa450edef68
2009-02-16 09:50:51 +00:00
Bosanac Dejan 049b43cd17 refactored failover uri test to support testing multiple values
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@744112 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 13:48:51 +00:00
Bosanac Dejan 479acad417 fix for https://issues.apache.org/activemq/browse/AMQ-2096
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@744082 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 11:29:01 +00:00
Bosanac Dejan 34b125e18f changing names of excluded kaha tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@744042 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 09:05:10 +00:00
Hiram R. Chirino e16a63815f The wireFormat option needs to get removed otherwise you'll get an error saying that it's unrecognized
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@743870 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 20:29:31 +00:00
Bosanac Dejan a18a55f75c excluding kaha tests as they are failing occasionally
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@743743 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 13:58:32 +00:00
Bosanac Dejan 610d5272ec additional fix for https://issues.apache.org/activemq/browse/AMQ-2103; some tests were failing because of this change
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@743741 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 13:57:22 +00:00
Bosanac Dejan b2148c5e7a fix for https://issues.apache.org/activemq/browse/AMQ-2104
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@743320 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 13:07:04 +00:00
Robert Davies 69e5f769b2 Fix for https://issues.apache.org/activemq/browse/AMQ-2103
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@743258 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 07:34:26 +00:00
Gary Tully 9a60743876 test for AMQ-2100
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@743027 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 17:38:28 +00:00
Gary Tully cfb4234cee fix up org.apache.activemq.network.MulticastNetworkTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@742941 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 11:51:43 +00:00
Robert Davies 586ea12d1e Fix for https://issues.apache.org/activemq/browse/AMQ-2100
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@742876 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 08:07:16 +00:00
Gary Tully 504bcf0596 demote log error or async exception to warn, with sendFailIfNoSpace, logs gets spammed with expected error messages
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@742603 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 16:33:50 +00:00
Bosanac Dejan 15065b71c7 fix for https://issues.apache.org/activemq/browse/AMQ-2088
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@742458 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 12:49:42 +00:00
Gary Tully 4dda0d8353 resolve npe if no mbeans found
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@742443 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 12:27:07 +00:00
Gary Tully 657e6fa1dd add extra assert to consumer advisory test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@742377 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 10:26:19 +00:00
Hiram R. Chirino b7c2b678bb Added a new TempKahaDBStore which is an optimized KahaDB based message for temporary messages.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741769 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 22:49:01 +00:00
Hiram R. Chirino f73b622a60 Change the way journal records are validated on recovery to be consistent. We now use a checksum to provide better consistency.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741741 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 21:35:39 +00:00
Hiram R. Chirino d761e80ae4 - added some handy generic visitors to the BTreeVisitor class.
- Updated the recovery process so it now rollsback changes applied to the index which did not get synced to the journal.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741659 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 18:19:31 +00:00
Hiram R. Chirino 51e82d59e7 better synchronization of the metadata.lastUpdate var
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741597 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 15:42:22 +00:00
Gary Tully deea2d11a8 expose relevant index attributes for configuration from kahadb
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741528 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 10:59:47 +00:00
Hiram R. Chirino d89a302041 Fixed StoreQueueCursorKahaDBNoDuplicateTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741334 13f79535-47bb-0310-9956-ffa450edef68
2009-02-05 22:46:01 +00:00
Hiram R. Chirino 273933378b Opps miss a couple of commits with that last change.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741329 13f79535-47bb-0310-9956-ffa450edef68
2009-02-05 22:42:42 +00:00
Hiram R. Chirino 180b0ec4ab - Implemented the setBatch API call in KahaDBStore.
- fixed bug: When a async thread was used for writing in KahaDBStore you could run in a Memory leak due to an unbound enqueue buffer type problem.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741327 13f79535-47bb-0310-9956-ffa450edef68
2009-02-05 22:41:01 +00:00
Gary Tully 63709a9a88 test for setBatch with KahaDB AMQ-2020
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741325 13f79535-47bb-0310-9956-ffa450edef68
2009-02-05 22:38:31 +00:00
Hiram R. Chirino 8262ef7903 Changed the cleanup algorithm used in the KahaDB.. It should now be much faster.
Fixed bug in the BTreeNode.visit() which was making us load most of the pages instead of letting us filter down to just a few.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741212 13f79535-47bb-0310-9956-ffa450edef68
2009-02-05 18:07:57 +00:00
Hiram R. Chirino c0594251e2 Bettter property names.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741169 13f79535-47bb-0310-9956-ffa450edef68
2009-02-05 16:33:23 +00:00
Hiram R. Chirino 19c4316a1c Added the ability to customize thw write batch size in the PageFile.
Added some diagnostic logging to see when store updates take too long and why.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741137 13f79535-47bb-0310-9956-ffa450edef68
2009-02-05 15:29:48 +00:00
Gary Tully 3c543a0cd0 pass asyncWrite flag to page file
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741136 13f79535-47bb-0310-9956-ffa450edef68
2009-02-05 15:29:00 +00:00
Bosanac Dejan 690b7bcbd1 a couple of Stomp improvements
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741109 13f79535-47bb-0310-9956-ffa450edef68
2009-02-05 14:33:59 +00:00
Gary Tully c22cd6563b update simple enqueue rate verifier for kaha store
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741096 13f79535-47bb-0310-9956-ffa450edef68
2009-02-05 13:07:32 +00:00
Gary Tully 9bb46820b2 store specific tests for setBatch http://issues.apache.org/activemq/browse/AMQ-2020
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741061 13f79535-47bb-0310-9956-ffa450edef68
2009-02-05 10:06:39 +00:00
Gary Tully 37c2a955a2 move setBatch to MessageStore interface to keep cursors store agnostic - http://issues.apache.org/activemq/browse/AMQ-2020 - some store specific tests to follow
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@740765 13f79535-47bb-0310-9956-ffa450edef68
2009-02-04 15:19:56 +00:00
Guillaume Nodet 1ab76f775d AMQ-2091: Add a cache to the jms selector parser for speed improvements
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@740375 13f79535-47bb-0310-9956-ffa450edef68
2009-02-03 19:05:07 +00:00
Hiram R. Chirino 5e2eedcac0 Added a option to be able to test againt the new kahadb store
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@740344 13f79535-47bb-0310-9956-ffa450edef68
2009-02-03 16:36:48 +00:00
Gary Tully 675afd6962 holder test to verify steady enqueue rate of store
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@740339 13f79535-47bb-0310-9956-ffa450edef68
2009-02-03 16:26:51 +00:00
Bosanac Dejan 662aee8f21 a bit better error message for https://issues.apache.org/activemq/browse/AMQ-2092
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@739966 13f79535-47bb-0310-9956-ffa450edef68
2009-02-02 11:50:29 +00:00
Gary Tully 40465998ee resolve issue with broken ra tests, allow XA operation on non transacted session, check for transaction now is xa aware
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@739961 13f79535-47bb-0310-9956-ffa450edef68
2009-02-02 11:14:05 +00:00
Bosanac Dejan 59643ef23e fix for https://issues.apache.org/activemq/browse/AMQ-2092
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@739950 13f79535-47bb-0310-9956-ffa450edef68
2009-02-02 09:28:28 +00:00
Gary Tully 564a9c2ca0 fix for https://issues.apache.org/activemq/browse/AMQ-1593
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@739307 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 15:30:24 +00:00
Bosanac Dejan 519045b7ab additional fix for https://issues.apache.org/activemq/browse/AMQ-2086; reverting changes since turning off persistence fails some tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@739293 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 14:33:04 +00:00
Bosanac Dejan 51f68fb110 additional fix for http://issues.apache.org/activemq/browse/AMQ-2016
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@739292 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 14:31:08 +00:00
Gary Tully 3804d66f6f resolve https://issues.apache.org/activemq/browse/AMQ-1730 - add some more tests and remove workaround for prefetch=0, relates to https://issues.apache.org/activemq/browse/AMQ-2087
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@739249 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 11:57:06 +00:00
Gary Tully 3b08860f10 resolve https://issues.apache.org/activemq/browse/AMQ-2087 - add a long attribute to RemoveInfo where the last delivered broker sequence id is passed back to the broker, prefetched messages with ids > than this value now don't get their redelivery count incremented, requires wireformat version increment and Destination api change
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@739008 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 20:51:09 +00:00
Bosanac Dejan f6ebeecc2a fix for https://issues.apache.org/activemq/browse/AMQ-1807
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@738904 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 16:01:35 +00:00
Gary Tully eaafb4c838 variant test case for https://issues.apache.org/activemq/browse/AMQ-2087
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@738577 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 18:25:01 +00:00
Gary Tully 06da208e16 test case for https://issues.apache.org/activemq/browse/AMQ-2087
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@738566 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 17:44:14 +00:00
Bosanac Dejan 43982afdfa apache licence headers
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@738423 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 09:52:59 +00:00
Bosanac Dejan 2bda17a6b0 additional fix for https://issues.apache.org/activemq/browse/AMQ-2086 and a couple of improvements for network tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@738421 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 09:50:31 +00:00
Bosanac Dejan 39dd6b914a fix for https://issues.apache.org/activemq/browse/AMQ-2086
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@738052 13f79535-47bb-0310-9956-ffa450edef68
2009-01-27 10:42:35 +00:00
David Jencks eee37fbdb4 ACTIVEMQ-2085 only create JMXConnectorServer if AMQ has created the mbean server
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@737951 13f79535-47bb-0310-9956-ffa450edef68
2009-01-27 00:55:33 +00:00
Gary Tully 9dec1b18ba test for https://issues.apache.org/activemq/browse/AMQ-2080 that shows use of reconnectDelay
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@737703 13f79535-47bb-0310-9956-ffa450edef68
2009-01-26 14:30:46 +00:00
Bosanac Dejan 26c25ebe6d adding some message group tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@737685 13f79535-47bb-0310-9956-ffa450edef68
2009-01-26 13:11:07 +00:00
Bosanac Dejan 977393d9e7 fix for http://issues.apache.org/activemq/browse/AMQ-2082
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@737062 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 15:56:14 +00:00
Bosanac Dejan a321204079 fix for http://issues.apache.org/activemq/browse/AMQ-2016
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@737017 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 12:11:00 +00:00
Bosanac Dejan 807f64591d Recovery dispatch refactoring as the part of the solution for the https://issues.apache.org/activemq/browse/AMQ-2016
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@736720 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 17:22:12 +00:00
David Jencks ab438f68c1 AMQ-2079 improve error messages in AMQConnection.createSession, and make ManagedConnectionProxy only supply consistent parameters
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@735914 13f79535-47bb-0310-9956-ffa450edef68
2009-01-20 02:13:31 +00:00
David Jencks 1f00a395f8 AMQ-2078 extend transaction tests to xa in ra
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@735912 13f79535-47bb-0310-9956-ffa450edef68
2009-01-20 02:06:37 +00:00
Gary Tully 2deea18cc2 applied patch from https://issues.apache.org/activemq/browse/AMQ-2068 with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@734981 13f79535-47bb-0310-9956-ffa450edef68
2009-01-16 11:47:02 +00:00
Bosanac Dejan e547cbdf4f fix for https://issues.apache.org/activemq/browse/AMQ-2047
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@734766 13f79535-47bb-0310-9956-ffa450edef68
2009-01-15 17:59:41 +00:00
Gary Tully 2d0fa5e415 resolve https://issues.apache.org/activemq/browse/AMQ-2051 - allow remove after remove failure
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@734524 13f79535-47bb-0310-9956-ffa450edef68
2009-01-14 21:53:02 +00:00
Gary Tully 3a56070500 resolve unit test failures from changes via: https://issues.apache.org/activemq/browse/AMQ-2034 - only use sync for close if in xa tx, this may need some rework for managed tck case
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@734393 13f79535-47bb-0310-9956-ffa450edef68
2009-01-14 13:45:17 +00:00
Bosanac Dejan d89abe0322 additional fix for https://issues.apache.org/activemq/browse/AMQ-2044
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@734364 13f79535-47bb-0310-9956-ffa450edef68
2009-01-14 12:19:15 +00:00
Gary Tully 20006a030d apply patch from https://issues.apache.org/activemq/browse/AMQ-2054
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@734256 13f79535-47bb-0310-9956-ffa450edef68
2009-01-13 22:15:25 +00:00
Gary Tully b5b6a0834d resolve https://issues.apache.org/activemq/browse/AMQ-2064 - persistence Adapter and temp store are now associated with the simple xbean system usage in the default activemq.xml
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@734194 13f79535-47bb-0310-9956-ffa450edef68
2009-01-13 17:41:50 +00:00
Bosanac Dejan 4dc1fccfdb excluding some tests that randomly fails and stops CI
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@734129 13f79535-47bb-0310-9956-ffa450edef68
2009-01-13 13:42:50 +00:00
Gary Tully f1d59cd2cd add test case to exercise producerFlowControl sendFailIfNoSpace with queue memory limit
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@734114 13f79535-47bb-0310-9956-ffa450edef68
2009-01-13 12:10:22 +00:00
Gary Tully 8b9e755035 resolve AMQ-2062 - add setExceptionListener to amq connection factory -
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@733811 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 15:48:07 +00:00
Gary Tully 0b34f3c89f resolve AMQ-2062 - add setExceptionListener to amq connection factory
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@733803 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 15:44:40 +00:00
Bosanac Dejan 4a1279639f fix for https://issues.apache.org/activemq/browse/AMQ-2061
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@733761 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 14:05:57 +00:00
Bosanac Dejan 589ec88a2b added basic test coverage checks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@732984 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 09:35:54 +00:00
Bosanac Dejan e3eba85450 fix for https://issues.apache.org/activemq/browse/AMQ-998
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@732672 13f79535-47bb-0310-9956-ffa450edef68
2009-01-08 10:05:51 +00:00
David Jencks 2387612628 AMQ-2034 move delay-session-close-in-xa-tx code to plain session so it works in managed environments. Also prevent duplicate synchronization registrations
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@732489 13f79535-47bb-0310-9956-ffa450edef68
2009-01-07 20:57:56 +00:00
David Jencks 07b6a38336 AMQ-2053 introduce methods to remove (closed) message stores from possible caches in PersistenceAdapters
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@732259 13f79535-47bb-0310-9956-ffa450edef68
2009-01-07 08:03:40 +00:00
David Jencks 34acbdc154 minor generics, import, and javadoc cleanup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@732184 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 23:52:36 +00:00
David Jencks e2c83d6fb6 Remove some dangerous method calls from the constructor (that did nothing), make some fields final, remove duplicate start tracking, and finish generic conversion
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@732182 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 23:48:44 +00:00
David Jencks d8c14e075f make use of 'this' more consistent and fix a couple warnings
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@732175 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 23:39:27 +00:00
David Jencks 4286731e0f fix comment explaining test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@732171 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 23:29:53 +00:00
Hiram R. Chirino f62737be7c Moving stuff around so that activemq-core can depend on kahadb instead of kahadb depending on activemq-core. This step allows kahadb to be used as the default
store implementation if desired.  Will do that next.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@731704 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 20:48:38 +00:00
Bosanac Dejan 4199c95098 improvement for https://issues.apache.org/activemq/browse/AMQ-1747 patch
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@731529 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 11:27:17 +00:00
David Jencks 8a857bdc01 AMQ-2052 another file name problem
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@730817 13f79535-47bb-0310-9956-ffa450edef68
2009-01-02 19:06:55 +00:00
David Jencks 78c002f568 AMQ-2052 more better fixes of where to make the name file system safe
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@730614 13f79535-47bb-0310-9956-ffa450edef68
2009-01-01 21:37:17 +00:00
David Jencks f27bd3c491 AMQ-2052 Throw an exception when references to non-existent messages are encountered
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@730598 13f79535-47bb-0310-9956-ffa450edef68
2009-01-01 20:18:08 +00:00
David Jencks 13d692ebde AMQ-2052 Be careful about when to use a file-system-safened id
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@730596 13f79535-47bb-0310-9956-ffa450edef68
2009-01-01 20:15:30 +00:00
David Jencks e08cc350e0 AMQ-2049 Fix race condition on ConnectionInfo by copying. Minor javaodc cleanup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@730226 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 20:05:16 +00:00
Bosanac Dejan 90fd917a67 fix for https://issues.apache.org/activemq/browse/AMQ-2046
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@730071 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 08:47:59 +00:00
Robert Davies 63e3f41af2 Fix for https://issues.apache.org/activemq/browse/AMQ-1842
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@729939 13f79535-47bb-0310-9956-ffa450edef68
2008-12-29 16:48:28 +00:00
David Jencks fd84b78d5b minor code cleanup - more final variables, generics, less unneeded initialization
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@729836 13f79535-47bb-0310-9956-ffa450edef68
2008-12-29 08:02:55 +00:00
David Jencks e585aaec2f AMQ-2045 Add consistency checks to Valve and balance usage in VMTransport
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@729835 13f79535-47bb-0310-9956-ffa450edef68
2008-12-29 07:56:09 +00:00
Robert Davies 3b374365c1 Fix for https://issues.apache.org/activemq/browse/AMQ-1918
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@729803 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 23:13:32 +00:00
Robert Davies dfdd8963ad Fix for https://issues.apache.org/activemq/browse/AMQ-2043
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@729703 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 08:13:05 +00:00
Bosanac Dejan bbdedeadf6 fix for https://issues.apache.org/activemq/browse/AMQ-2044
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@729498 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 14:31:09 +00:00
David Jencks 185711e2f5 minor javadoc and spelling fixes
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@729437 13f79535-47bb-0310-9956-ffa450edef68
2008-12-25 20:17:29 +00:00
Gary Tully 99819f378f fix AMQ-2021 with test, seems to be the same issue in AMQ-2035
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@729038 13f79535-47bb-0310-9956-ffa450edef68
2008-12-23 17:02:35 +00:00
Bosanac Dejan 27cbf7b691 fix for https://issues.apache.org/activemq/browse/AMQ-2038
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@728964 13f79535-47bb-0310-9956-ffa450edef68
2008-12-23 14:23:38 +00:00
Gary Tully 9a432f22f9 resolve AMQ-2033 - patch applied with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@727353 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 12:00:40 +00:00
Bosanac Dejan d8bdf5b3e2 fix for prefetch size issue reported in AMQ-1807
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@727017 13f79535-47bb-0310-9956-ffa450edef68
2008-12-16 11:02:28 +00:00
Gary Tully 739e1378a6 resolve AMQ-2006 - patch applied with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@726785 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 19:51:16 +00:00
Gary Tully 50a98e3b0e fix - AMQ-2034 - have close in XA transaction deferred to synchronisation after completion, have rollback call beforeEnd to propagate acknowledgements; add a bunch of tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@726764 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 18:48:51 +00:00
Bosanac Dejan 7aec12eaca fix for AMQ-1989 and a couple of improvements for Stomp Java client
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@726668 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 10:17:47 +00:00
Gary Tully 4229aee737 fix AMQ-2032 - consumer.dispose was clearing delivered messages even if in a tx
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@725737 13f79535-47bb-0310-9956-ffa450edef68
2008-12-11 16:36:59 +00:00
Gary Tully 301203e625 resolve AMQ-2030, rev OpenWire version to 4 to accomadate additional field in ConsumerInfo that can hold array of networkConsumerIds that allows suppression of duplicate topic subscriptions in a cyclic network
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@725323 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 16:23:07 +00:00
David Jencks 577eae65fd AMQ-2028 fix thread safety problem in ActiveMQSessionExecutor
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@725020 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 07:16:39 +00:00
David Jencks 9e6f62b7c2 AMQ-2029 set JMS* headers on non-amq messages, with a test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@725019 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 07:14:21 +00:00
Robert Davies 0cf2cdc719 Fix for https://issues.apache.org/activemq/browse/AMQ-2025
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@723614 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 06:44:41 +00:00
Gary Tully d7f34d9a6f resolve AMQ-2020, we may want to push setBatch into the MessageStore inteface, see the use by the cursors when the cache is exhausted
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@722983 13f79535-47bb-0310-9956-ffa450edef68
2008-12-03 17:44:39 +00:00
Robert Davies 38cfc9b164 Fix for https://issues.apache.org/activemq/browse/AMQ-2015
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@722683 13f79535-47bb-0310-9956-ffa450edef68
2008-12-02 23:59:11 +00:00
Gary Tully 7673448206 resolve some dependency divergence among modules
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@719220 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 12:58:44 +00:00
Gary Tully 0fe1944bad improve debug log information
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@719219 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 12:57:36 +00:00
Gary Tully 2b2b35e757 resolve AMQ-2005, Scheduler is now referenced by its users such that it cannot be gc'ed during normal operation
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@718931 13f79535-47bb-0310-9956-ffa450edef68
2008-11-19 11:08:54 +00:00
Bosanac Dejan da98de0459 fix for AMQ-2003
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@718592 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 13:57:01 +00:00
Bosanac Dejan 1ab2f59af7 fix for AMQ-2003
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@718590 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 13:56:13 +00:00
Gary Tully e53668eb23 resolve AMQ-2004
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@718403 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 21:55:46 +00:00
Gary Tully 6d1f57b137 test case and logging improvements relating to cyclic/multicast discovery network of size 3 and topic message duplication with nteworkTTL > 1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@718224 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 11:49:28 +00:00
Gary Tully 0bfb28a0bc reapplying patch from AMQ-1957 with small ammendment for transactional behaviour, reverting changes that fixed broken tests as tests now pass
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@712189 13f79535-47bb-0310-9956-ffa450edef68
2008-11-07 16:38:51 +00:00
Gary Tully 92e143155b a test variant to validate AMQ-1957
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@712117 13f79535-47bb-0310-9956-ffa450edef68
2008-11-07 12:51:54 +00:00
Gary Tully c57afb6289 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@711804 13f79535-47bb-0310-9956-ffa450edef68
2008-11-06 09:19:35 +00:00
Gary Tully fcab7488bc [maven-release-plugin] prepare release activemq-5.2.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@711802 13f79535-47bb-0310-9956-ffa450edef68
2008-11-06 09:17:14 +00:00
Gary Tully 7238f80d9b resolve AMQ-1995
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@711617 13f79535-47bb-0310-9956-ffa450edef68
2008-11-05 17:01:05 +00:00
Gary Tully f8eed489fb addendum for AMQ-1993
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@711292 13f79535-47bb-0310-9956-ffa450edef68
2008-11-04 16:17:51 +00:00
Gary Tully 5b47fe7a6c ensure master is always started before first connect attempt, ignore expected exception on shutdown
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@711284 13f79535-47bb-0310-9956-ffa450edef68
2008-11-04 16:05:01 +00:00
Gary Tully c27db108fd have master wait for slave to ensure slave is always present for duration of test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@711264 13f79535-47bb-0310-9956-ffa450edef68
2008-11-04 14:38:20 +00:00
Gary Tully f561d6bb67 apply patch for AMQ-1993, thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@710109 13f79535-47bb-0310-9956-ffa450edef68
2008-11-03 17:30:59 +00:00
Gary Tully 0d2172bc9b apply threadName filter feature patch for AMQ-1993
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@710061 13f79535-47bb-0310-9956-ffa450edef68
2008-11-03 14:22:48 +00:00
Gary Tully 46b5eb15fd resolve AMQ-1191 - patch applied, thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@710048 13f79535-47bb-0310-9956-ffa450edef68
2008-11-03 13:05:37 +00:00
Gary Tully 03a6468d12 resolve AMQ-1983
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@708548 13f79535-47bb-0310-9956-ffa450edef68
2008-10-28 12:07:27 +00:00
Gary Tully 1651992d10 more transactional and concurrent tests for master slave to try and reproduce AMQ-1983
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@707644 13f79535-47bb-0310-9956-ffa450edef68
2008-10-24 14:31:01 +00:00
Gary Tully f3e603959a test case that verifies setting a listener from onMessage
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@707609 13f79535-47bb-0310-9956-ffa450edef68
2008-10-24 12:03:23 +00:00
Gary Tully 8b34eacc26 remove extraneous printStacks from activemq-core test run console, stacks are now in the test log
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@707590 13f79535-47bb-0310-9956-ffa450edef68
2008-10-24 09:45:58 +00:00
Gary Tully fe50dd693f remove a few stack traces from test stdout
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@707429 13f79535-47bb-0310-9956-ffa450edef68
2008-10-23 18:00:11 +00:00
Gary Tully 81f0cc0d04 fix AMQ-1984 - hanging consumer receive after multiple consumer disconnect/reconnect
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@707415 13f79535-47bb-0310-9956-ffa450edef68
2008-10-23 16:52:27 +00:00
Robert Davies 58b8d19a97 Fix for https://issues.apache.org/activemq/browse/AMQ-1964
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@707064 13f79535-47bb-0310-9956-ffa450edef68
2008-10-22 13:02:31 +00:00
Robert Davies 537b1b0284 Fix for https://issues.apache.org/activemq/browse/AMQ-1965
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@707059 13f79535-47bb-0310-9956-ffa450edef68
2008-10-22 12:45:30 +00:00
Bosanac Dejan 1f01c94d24 fix for AMQ-1978
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@706299 13f79535-47bb-0310-9956-ffa450edef68
2008-10-20 14:14:31 +00:00
Gary Tully 329e215a05 ensure test won't hang if mbean server never comes alive, just in case
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@705642 13f79535-47bb-0310-9956-ffa450edef68
2008-10-17 15:23:11 +00:00
Gary Tully eabb5156ad fix issue with test, checking for the presence of Mbeans before the rmi transport for the mbean server is fully active
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@705636 13f79535-47bb-0310-9956-ffa450edef68
2008-10-17 15:10:08 +00:00
Gary Tully d81ce2e276 resolve AMQ-1979, slave connection did not know about temp destinations so it would not delete on close, only on an explicit delete command
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@705592 13f79535-47bb-0310-9956-ffa450edef68
2008-10-17 13:00:54 +00:00
Bosanac Dejan 4842547a5b fix for AMQ-1981
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@705547 13f79535-47bb-0310-9956-ffa450edef68
2008-10-17 10:22:24 +00:00
Gary Tully fdee6e81e2 AMQ-1976, individual messages passing through a network bridge need an individual ack; for an individual ack, it is ok to have more than one message dispatched
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@705281 13f79535-47bb-0310-9956-ffa450edef68
2008-10-16 16:48:52 +00:00
Gary Tully bc7e759662 test case for AMQ-1976, just remove the short circut return to try
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@705259 13f79535-47bb-0310-9956-ffa450edef68
2008-10-16 15:13:17 +00:00
Gary Tully 3a95fff234 fix intermittent failure of org.apache.activemq.usecases.MultiBrokersMultiClientsUsingTcpTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@705190 13f79535-47bb-0310-9956-ffa450edef68
2008-10-16 09:57:37 +00:00
Robert Davies 8e06b20b0a fix for https://issues.apache.org/activemq/browse/AMQ-1980
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@705147 13f79535-47bb-0310-9956-ffa450edef68
2008-10-16 06:53:55 +00:00
Gary Tully 543bc84a88 resolve AMQ-1977, some more choreography required in duplex case. Fix duplication of deleteAllMessageOnStartup which slows down JDBC test, add some more robustness to DuplexNetworkMBeanTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@704846 13f79535-47bb-0310-9956-ffa450edef68
2008-10-15 10:10:29 +00:00
Bosanac Dejan d33adc961c print message properties with with toString()
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@704544 13f79535-47bb-0310-9956-ffa450edef68
2008-10-14 14:05:52 +00:00
Bosanac Dejan 117cf0209e fix for AMQ-1978
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@704508 13f79535-47bb-0310-9956-ffa450edef68
2008-10-14 12:15:36 +00:00
Gary Tully ae1bb668d6 fix AMQ-1970 - pagedInMessages in slave was being filled due to more than 200(pageSize) unacked messages and slave not modifying the inflight count which is used in the pageIn logic
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@704142 13f79535-47bb-0310-9956-ffa450edef68
2008-10-13 15:24:31 +00:00
Robert Davies d261412058 Fix for https://issues.apache.org/activemq/browse/AMQ-1971
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@703975 13f79535-47bb-0310-9956-ffa450edef68
2008-10-13 08:57:07 +00:00
Hiram R. Chirino 73b8f233b0 AMQ-1972
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@703482 13f79535-47bb-0310-9956-ffa450edef68
2008-10-10 14:01:59 +00:00
Gary Tully 876118997b revert/rework AMQ-1521, fix for AMQ-1973; new test case and SocketProxy that can be used to simulate network outage
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@703447 13f79535-47bb-0310-9956-ffa450edef68
2008-10-10 13:11:49 +00:00
Hiram R. Chirino 01e520a827 Impl for https://issues.apache.org/activemq/browse/AMQ-1972
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@703172 13f79535-47bb-0310-9956-ffa450edef68
2008-10-09 14:29:25 +00:00
Gary Tully 9fbba8d1f8 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@702534 13f79535-47bb-0310-9956-ffa450edef68
2008-10-07 16:26:23 +00:00
Gary Tully dd0d2329ac [maven-release-plugin] prepare release activemq-5.2.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@702519 13f79535-47bb-0310-9956-ffa450edef68
2008-10-07 15:34:39 +00:00
Robert Davies 0706a4ce7c added groups
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@702452 13f79535-47bb-0310-9956-ffa450edef68
2008-10-07 12:31:59 +00:00
Gary Tully f8071a34a4 AMQ-1967 - fix: SslTransportServerTest, check for null transportOptions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@702447 13f79535-47bb-0310-9956-ffa450edef68
2008-10-07 12:01:03 +00:00
Hiram R. Chirino 3fe7760e4a Applying AMQ-1957.. Thanks for the patch.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@702152 13f79535-47bb-0310-9956-ffa450edef68
2008-10-06 14:11:51 +00:00
Gary Tully 3332220a35 fix AMQ-1967, server side transport options are now respected, it is possible to configure a broker connector url like tcp://localhost:61617?transport.reuseAddress=true etc
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@701477 13f79535-47bb-0310-9956-ffa450edef68
2008-10-03 18:18:38 +00:00
Gary Tully 5ed74fd211 improve robustness of MasterSlaveTempQueueMemoryTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@701345 13f79535-47bb-0310-9956-ffa450edef68
2008-10-03 10:26:22 +00:00
Bosanac Dejan 1c42716ecb Fix for AMQ-1963
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@701333 13f79535-47bb-0310-9956-ffa450edef68
2008-10-03 09:26:27 +00:00
Gary Tully 5d9351846c AMQ-1962 - ensure size is not calculated on stop after store has shutdown
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@701118 13f79535-47bb-0310-9956-ffa450edef68
2008-10-02 13:19:08 +00:00
Gary Tully b22832e2d8 fix AMQ-1956
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@701088 13f79535-47bb-0310-9956-ffa450edef68
2008-10-02 11:44:29 +00:00
Gary Tully 6dbd5d19cc fix AMQ-1962, reset or cursor as a result of empty subscription list was incorrectly setting store size to 0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@701072 13f79535-47bb-0310-9956-ffa450edef68
2008-10-02 10:46:15 +00:00
Gary Tully 8469d75f38 fix DiscoveryTransportNoBrokerTest failure on slow host name resolution, reconnectAttempts is not relevant when the multicast address cannot be resolved, modified test to reflect this
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@700838 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 16:58:08 +00:00
Gary Tully c48c23f47c AMQ-1950 - fix for slave hang with temp queue creation/deletion
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@700823 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 16:15:53 +00:00
Gary Tully 4d6043aa94 fix regression AMQ-1959
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@700746 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 12:01:00 +00:00
Hiram R. Chirino ddd2fa687b Fix for https://issues.apache.org/activemq/browse/AMQ-1953
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@698800 13f79535-47bb-0310-9956-ffa450edef68
2008-09-25 02:46:57 +00:00
Hiram R. Chirino c6e0a61d73 Fix for https://issues.apache.org/activemq/browse/AMQ-1952
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@698719 13f79535-47bb-0310-9956-ffa450edef68
2008-09-24 20:35:36 +00:00
Hiram R. Chirino fc338b7e0d Fix for the JMSConsumerTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@698611 13f79535-47bb-0310-9956-ffa450edef68
2008-09-24 15:27:26 +00:00
Robert Davies 21b44e9b37 Fix for https://issues.apache.org/activemq/browse/AMQ-1436
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@698603 13f79535-47bb-0310-9956-ffa450edef68
2008-09-24 15:02:45 +00:00
Hiram R. Chirino efdf8ce25a https://issues.apache.org/activemq/browse/AMQ-1951
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@698595 13f79535-47bb-0310-9956-ffa450edef68
2008-09-24 14:46:00 +00:00
Robert Davies 63b2c406a8 Fix for https://issues.apache.org/activemq/browse/AMQ-1947
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@698573 13f79535-47bb-0310-9956-ffa450edef68
2008-09-24 13:51:18 +00:00
Hiram R. Chirino 9fe716b99f adding test case for https://issues.apache.org/activemq/browse/AMQ-1949
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@698175 13f79535-47bb-0310-9956-ffa450edef68
2008-09-23 13:20:57 +00:00
Robert Davies 5af81189b1 removed mutexes - as they are handled at the transport level -
Fix for https://issues.apache.org/activemq/browse/AMQ-1818

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@698103 13f79535-47bb-0310-9956-ffa450edef68
2008-09-23 06:55:52 +00:00
Robert Davies e2d743ea8a Fix for https://issues.apache.org/activemq/browse/AMQ-1947
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@697957 13f79535-47bb-0310-9956-ffa450edef68
2008-09-22 19:30:04 +00:00
Robert Davies 4d0e57261c Fix for https://issues.apache.org/activemq/browse/AMQ-1943
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@697953 13f79535-47bb-0310-9956-ffa450edef68
2008-09-22 19:17:24 +00:00
Robert Davies 3c6805183d Fix for https://issues.apache.org/activemq/browse/AMQ-1946
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@697937 13f79535-47bb-0310-9956-ffa450edef68
2008-09-22 18:35:32 +00:00
Robert Davies b6115cf660 Fix for https://issues.apache.org/activemq/browse/AMQ-1940
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@697921 13f79535-47bb-0310-9956-ffa450edef68
2008-09-22 18:15:34 +00:00
Hiram R. Chirino 93439b2853 Don't set the first message id if it's not known. It gets calcuated on the server side.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@697850 13f79535-47bb-0310-9956-ffa450edef68
2008-09-22 14:32:03 +00:00
Robert Davies 553deac60a Added licence
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@696757 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 18:40:53 +00:00