Commit Graph

5590 Commits

Author SHA1 Message Date
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
Gary Tully f4e0725420 https://issues.apache.org/jira/browse/AMQ-3542 - prevent failover reconnect till start is initiated, prevents connection establishment w/o a listener which ensures a bridge is already ready to handle a response and start a local bridge, useDedicatedTaskRunner=true can lead to this case
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186654 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 07:59:05 +00:00
Gary Tully 1250163f39 https://issues.apache.org/jira/browse/AMQ-3481 - check for tryLock success before unlock
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186539 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 22:26:07 +00:00
Timothy A. Bish 1fd39c991e Remove dependence on fixed port.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186494 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 21:11:34 +00:00
Gary Tully 54ff0ce448 https://issues.apache.org/jira/browse/AMQ-3542 - remove duplicate bridge stop, could on occasion beat another thread to the stop and cause a deadlock, resulting in intermittent failure to restart a bridge
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186258 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 15:09:59 +00:00
Timothy A. Bish 5b11ea0e8f Adds some new tests in the HTTP transport layer.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186216 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 13:50:38 +00:00
Bosanac Dejan 3c3b5bbd74 https://issues.apache.org/jira/browse/AMQ-3550 - local option for vritual topics
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186095 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 11:13:19 +00:00
Timothy A. Bish f3e9ec0b81 Removes the dependence on the fixed ports, should prevent needless test failures.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1185804 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 19:05:15 +00:00
Timothy A. Bish 6c82480a10 test for: https://issues.apache.org/jira/browse/AMQ-2200
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1185792 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 18:47:44 +00:00
Gary Tully 174c40579a https://issues.apache.org/jira/browse/AMQ-3542 - further simplification of network bridge start, remove latch wait states, add duplex test variant
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1185765 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 17:31:27 +00:00
Timothy A. Bish 970a97ac5f Push enough data through the socket so that the socket close gets detected.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1185210 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 14:33:41 +00:00
Timothy A. Bish 6c4bcb3197 https://issues.apache.org/jira/browse/AMQ-3500
Don't remove the options, just get them each time.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1185129 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 12:44:55 +00:00
Bosanac Dejan 75e6f1981d TwoBrokerVirtualDestDinamicallyIncludedDestTest - test virtual topics over network of brokers setup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1185097 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 10:35:29 +00:00
Timothy A. Bish b7f280817d https://issues.apache.org/jira/browse/AMQ-3500
fix a cut and paste oops

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1184866 13f79535-47bb-0310-9956-ffa450edef68
2011-10-16 16:54:18 +00:00
Timothy A. Bish 56272fab37 https://issues.apache.org/jira/browse/AMQ-3500
Only validate the params inside the domain of the producer or consumer.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1184834 13f79535-47bb-0310-9956-ffa450edef68
2011-10-16 14:28:42 +00:00
Timothy A. Bish 9ff350033f fix for: https://issues.apache.org/jira/browse/AMQ-3543
Unit test added.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1183495 13f79535-47bb-0310-9956-ffa450edef68
2011-10-14 20:52:35 +00:00
Timothy A. Bish baac9e7e9a fix for: https://issues.apache.org/jira/browse/AMQ-1132
Remove the dependency on the ActiveIO test.jar.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1183359 13f79535-47bb-0310-9956-ffa450edef68
2011-10-14 13:40:49 +00:00
Timothy A. Bish 6579d9eada apply patch for: https://issues.apache.org/jira/browse/AMQ-3536
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1183342 13f79535-47bb-0310-9956-ffa450edef68
2011-10-14 13:07:01 +00:00
Timothy A. Bish 88f60580e3 apply fix for: https://issues.apache.org/jira/browse/AMQ-3500
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1183143 13f79535-47bb-0310-9956-ffa450edef68
2011-10-13 22:28:47 +00:00
Gary Tully 4acd13243a https://issues.apache.org/jira/browse/AMQ-3542 - Using failover: with static discovery in a network connector to choose from a master/slave tuple leads to hangs and invalid states. issue with demand forward bridge reacting to failover transport interupt/resume leading to race conditions. race condition with tracking bridges and restarts. change default maxReconnectAttempts=0 to mean none, -1 for infinte. Default behavour is still infinite. To reference a master slave pair, use: static:(failover:(a,b)?maxReconnectAttempts=0)?useExponentialBackOff=false. see org.apache.activemq.network.FailoverStaticNetworkTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1183062 13f79535-47bb-0310-9956-ffa450edef68
2011-10-13 20:07:48 +00:00
Timothy A. Bish 8a3bdd9f71 https://issues.apache.org/jira/browse/AMQ-1514
Adds support of HTTP proxy auth using HttpClient 4.1.2 APIs

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1182931 13f79535-47bb-0310-9956-ffa450edef68
2011-10-13 16:01:28 +00:00
Timothy A. Bish f33f32e892 fix for: https://issues.apache.org/jira/browse/AMQ-3481
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1182890 13f79535-47bb-0310-9956-ffa450edef68
2011-10-13 14:54:15 +00:00
Timothy A. Bish 3b381e7c15 https://issues.apache.org/jira/browse/AMQ-3481
Further refine this fix to address some test failures. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1182049 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 19:39:45 +00:00
Gary Tully 39ca3de50e https://issues.apache.org/jira/browse/AMQ-3491 - Investigate and resolve LGPL dependency via camel-web. Removing camel-web dependency due to its downstream lgpl dep. We can bring it back in if/when it is cleaned up
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1181860 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 15:59:20 +00:00
Gary Tully ab9bce6147 give consumer a little more time for slower hardware
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1181711 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 11:09:39 +00:00
Gary Tully c8f42e72fb https://issues.apache.org/jira/browse/AMQ-3259 - remove ref to legacy maven-repository.dev.java.net, artifacts now in maven2 format
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1181707 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 10:59:42 +00:00
Gary Tully 6468eba5e6 update openwire verison for 5.6 release, addition of security token in connection control
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1181219 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 20:27:21 +00:00
Gary Tully 9c9b85659c https://issues.apache.org/jira/browse/AMQ-3532 - expiry of offline durable subscription on activation can lead do duplicate expiry processing and negative pending cursor size, resolve duplicate cursor remove and contention with dispatch, additional test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1181112 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 18:21:46 +00:00
Timothy A. Bish 3a806e98dc Test for: https://issues.apache.org/jira/browse/AMQ-3324
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1181022 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 15:31:09 +00:00
Gary Tully 2398a3a377 https://issues.apache.org/jira/browse/AMQ-3519 - fix regression in org.apache.activemq.bugs.AMQ2983Test, transacted ack needs to use async remove to ensure a concurrent dispatch does not preceed an ack
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1180884 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 11:47:09 +00:00
Timothy A. Bish 8cf318788d fix for: https://issues.apache.org/jira/browse/AMQ-3481
Issues arises when the StompTransport is sending an Ack back for Auto Ack 
mode in the same thread as the message was dispatched in.  If an incoming 
command beats the auto ack to onCommand in the activity monitor it will block
as the original thread is now waiting on the incoming command for the transport
lock.  Need to send back the Auto Acks in their own thread using a Task Runner
in the Stomp Transport so that the dispatch thread can complete and release
its lock on the transport.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1180070 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 15:22:31 +00:00
Timothy A. Bish 216f74e003 Give a little extra time for the Stomp frames to take effect.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1180059 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 14:43:53 +00:00
Timothy A. Bish bfd1be561d fix for: https://issues.apache.org/jira/browse/AMQ-2643
track pooled sessions in the parent ConnectionPool and ensure 
they get closed and returned to the pool.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1180038 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 13:51:44 +00:00