Gary Tully
3557361e86
https://issues.apache.org/jira/browse/AMQ-3596 - FilePendingMessageCursor memory list does not respect priority for non persistent messages. Fix with test. Reuse pendinglist from vm cursor for the file pending message cursor in memory list
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1202153 13f79535-47bb-0310-9956-ffa450edef68
2011-11-15 12:21:20 +00:00
Bosanac Dejan
1462fd234c
https://issues.apache.org/jira/browse/AMQ-3168 - use boolean editor for most used broker service boolean properties
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1201666 13f79535-47bb-0310-9956-ffa450edef68
2011-11-14 11:15:02 +00:00
Bosanac Dejan
c0c92595fd
https://issues.apache.org/jira/browse/AMQ-3168 - use boolean editor for createConnector property, to avoid problems with schema validation
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1201662 13f79535-47bb-0310-9956-ffa450edef68
2011-11-14 10:50:47 +00:00
Timothy A. Bish
5396b2bca1
Update XStream and slf4j to latest releases
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1201067 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 22:03:11 +00:00
Timothy A. Bish
7b02226bd6
fix for: https://issues.apache.org/jira/browse/AMQ-3589
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1201059 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 21:30:47 +00:00
Timothy A. Bish
5af811f272
Fix for: https://issues.apache.org/jira/browse/AMQ-3590
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1201054 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 21:15:14 +00:00
Timothy A. Bish
5886b66ed3
apply patch for: https://issues.apache.org/jira/browse/AMQ-3588
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1200532 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 20:28:20 +00:00
Timothy A. Bish
77f9b87294
Add missing license header and a tearDown method to ensure the created BrokerService gets stopped.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1200489 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 19:28:59 +00:00
Bosanac Dejan
55e7216292
https://issues.apache.org/jira/browse/AMQ-3581 - web console escape url
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1199259 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 14:29:34 +00:00
Timothy A. Bish
5b99f118a2
Adds an additional test case to verify that when doing request reply with two connections that ReplyTo values are prefixed with /remote-temp-topic and /remote-temp-queue to indicate that the connection receiving them is not the one that created them.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1197717 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 19:10:20 +00:00
Bosanac Dejan
e0b23f27e2
https://issues.apache.org/jira/browse/AMQ-3579 - http transport in osgi
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1197537 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 12:38:15 +00:00
Gary Tully
0018f4a3ad
https://issues.apache.org/jira/browse/AMQ-3576 - implementation for network connectors, the store needs to be queried b/c messages from multiple producers are multiplexed by a network connector bridge. Additional boolean auditNetworkProducers on TransportConnector can disable the check if duplicates can be dealt with by the application layer. Additional test included.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1197203 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 16:23:29 +00:00
Gary Tully
2711ad1f3f
https://issues.apache.org/jira/browse/AMQ-3576 - fix regression in network connector tests, the sequence id check is not valud for bridges that concentrate messages from multiple consumers. duplicate suppression for network connectors needs to be based on message ids
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1197072 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 11:53:31 +00:00
Gary Tully
5cf33b52c1
https://issues.apache.org/jira/browse/AMQ-3576 - only update audit sequence on valid message, apply test to isolated class where broker side timeout is absent
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1196804 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 21:17:41 +00:00
Bosanac Dejan
aa8bc42fd4
https://issues.apache.org/jira/browse/AMQ-3576 - tidying up the test
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1196710 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 17:23:39 +00:00
Bosanac Dejan
70057cb9ce
https://issues.apache.org/jira/browse/AMQ-3576 - producer exchange sync last seq id
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1196709 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 17:23:15 +00:00
Gary Tully
6ffbed9947
test to valudate soWriteTimeout on the client
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1196570 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 13:31:02 +00:00
Timothy A. Bish
4ab5e910cb
Fix timing dependent assertion.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1195988 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 13:26:26 +00:00
Timothy A. Bish
419fde4457
Fix for: https://issues.apache.org/jira/browse/AMQ-3537
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1195708 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 22:34:16 +00:00
Timothy A. Bish
0b6bf7ec1b
Fix for: https://issues.apache.org/jira/browse/AMQ-1853
...
Tests included.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1195615 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 18:54:19 +00:00
Timothy A. Bish
0a66b79332
additional fixes for: https://issues.apache.org/jira/browse/AMQ-3547
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1195278 13f79535-47bb-0310-9956-ffa450edef68
2011-10-30 23:27:52 +00:00
Timothy A. Bish
15f641634b
fix for: https://issues.apache.org/jira/browse/AMQ-3547
...
Add an assertion to test that interrupted state is preserved.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1195046 13f79535-47bb-0310-9956-ffa450edef68
2011-10-29 21:44:27 +00:00
Timothy A. Bish
83fde0b2a0
fix for: https://issues.apache.org/jira/browse/AMQ-3547
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1195045 13f79535-47bb-0310-9956-ffa450edef68
2011-10-29 21:42:49 +00:00
Timothy A. Bish
f0ed5d0c72
Fix a couple of tests that sleep for longer than necessary, use the Wait object when possible.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1190615 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 21:57:37 +00:00
Gary Tully
9ee2967220
https://issues.apache.org/jira/browse/AMQ-3519 - fix intermittent failure of org.apache.activemq.broker.RedeliveryRestartTest. inddividual ack marking delivery must be sent sync
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1190265 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 12:11:18 +00:00
Timothy A. Bish
8340decaf3
Apply patch for https://issues.apache.org/jira/browse/AMQ-3541
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1189980 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 19:58:42 +00:00
Timothy A. Bish
48bf681246
https://issues.apache.org/jira/browse/AMQ-3235
...
Bumping Camel to 2.8.2
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1189949 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 19:21:33 +00:00
Hiram R. Chirino
0d01b16e25
Fixes AMQ-3570: Improve ActiveMQ's XSD to allow elements to appear in any order
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1189740 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 13:19:49 +00:00
Gary Tully
cf33916c6e
this test takes too long in hudson, reduce the amount of messages processed, quantity does not add much to the test
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1189734 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 13:03:02 +00:00
Gary Tully
90af5c59e8
fix intermittent failure - org.apache.activemq.bugs.AMQ2764Test#testBrokerRestart, have network consumers use lower priority so that a local consumer can get all messages < prefetch
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1189717 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 12:29:28 +00:00
Gary Tully
6778a49eec
https://issues.apache.org/jira/browse/AMQ-3568 - Consumer auto acking of duplicate message dispatch can lead to Unmatched acknowledge: and redelivery. Using individual ack in this case. Added a warn, as this sort of duplicate shoud be trapped by the store producerAudit, maxFailoverProducersToTrack may need an increase
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1189700 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 10:21:20 +00:00
Timothy A. Bish
e6909d8970
Apply patch for: https://issues.apache.org/jira/browse/AMQ-3567
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1189370 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 18:36:52 +00:00
Timothy A. Bish
28e9cd7eee
fix for https://issues.apache.org/jira/browse/AMQ-2526
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1188925 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 21:23:30 +00:00
Timothy A. Bish
ef850895a2
fix for: https://issues.apache.org/jira/browse/AMQ-3566
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1188839 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 18:03:37 +00:00
Gary Tully
07eef8e293
https://issues.apache.org/jira/browse/AMQ-3563 - Update javadoc links to point to JDK 1.6 and JEE 1.5. Patch applied with thanks.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1188788 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 16:57:39 +00:00
Gary Tully
9ba8d2681f
https://issues.apache.org/jira/browse/AMQ-3564 - new masterslave: discovery scheme for network connectors to master slave pairs, more intuitive configuration. Layers over static:failover:(a,b)?maxReconnectAttempts=0. Impl and test
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1188641 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 13:03:18 +00:00
Timothy A. Bish
f4df288872
fix for: https://issues.apache.org/jira/browse/AMQ-3562
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1188371 13f79535-47bb-0310-9956-ffa450edef68
2011-10-24 20:52:23 +00:00
Timothy A. Bish
0b1b6fa3ca
Give this one just a bit more time to see if its just slow machines that cause it to fail.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1188146 13f79535-47bb-0310-9956-ffa450edef68
2011-10-24 14:07:29 +00:00
Timothy A. Bish
534a44fbd6
https://issues.apache.org/jira/browse/AMQ-3559
...
Fix for failing unit test.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1188145 13f79535-47bb-0310-9956-ffa450edef68
2011-10-24 13:37:31 +00:00
Timothy A. Bish
e7784672ac
https://issues.apache.org/jira/browse/AMQ-3504
...
Move to the latest Jetty version that still allows the Web Console to work. This version has the latest websocket updates that jetty has to offer.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1187817 13f79535-47bb-0310-9956-ffa450edef68
2011-10-22 22:22:51 +00:00
Timothy A. Bish
06611d9c19
Fix assertion error messages so that indicate an actual error.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1187577 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 22:18:28 +00:00
Timothy A. Bish
c273cab44a
fix for: https://issues.apache.org/jira/browse/AMQ-3559
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1187538 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 21:02:56 +00:00
Gary Tully
5b796cd8d6
https://issues.apache.org/jira/browse/AMQ-3558 - Allow the base network consumer priority to be configured on a networkConnector. Addition of consumerPriorityBase atribute to networkConnector configuration, additional test. This allows the base to be configured such that one network connector can have priority over another
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1187461 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 16:46:43 +00:00
Gary Tully
85edfb3425
https://issues.apache.org/jira/browse/AMQ-3533 - mKahaDB, allow the directory of a filtered destination to be specified, such that destination journals can be split across disks. Fixed with test
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1187280 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 10:15:26 +00:00
Timothy A. Bish
4b202c1d7a
fix for: https://issues.apache.org/jira/browse/AMQ-3556
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1187001 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 19:21:55 +00:00
Gary Tully
8ce077800f
https://issues.apache.org/jira/browse/AMQ-3551 - exclude networkConnectors from sendFailIfNoSpace on producer flow control, with test for topic and queue networks
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186952 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 17:35:04 +00:00
Timothy A. Bish
fa40250863
Fix for: https://issues.apache.org/jira/browse/AMQ-2240
...
URI options that are unmatched should result in an error
to prevent subtle errors in configuration.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186842 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 15:04:21 +00:00
Timothy A. Bish
4553ff18ef
Remove fixed port usage and disable JMX since this test doesn't use it.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186833 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 14:27:07 +00:00
Gary Tully
6d077dc7b4
https://issues.apache.org/jira/browse/AMQ-3331 - apply variant of patch with thanks.
...
Added boolean attribute, alwaysSyncSend to the network connector. This allows the
behaviour for persistent messages to be applied to non-persistent messages.
It does not make sense to have an alwaysAsync mode as this could lead to lost
persistent messages.
Also, I agree with the assment of the use of the responseRequired flag, it should
be based on the persistence attribute of the message, which it is now.
This is vital such that messages sent in transactions are not sent async.
Thanks for the great test case, made life easier.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186813 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 13:56:17 +00:00
Timothy A. Bish
87e64a306d
fix for: https://issues.apache.org/jira/browse/AMQ-2229
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186787 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 13:10:22 +00:00