Commit Graph

6236 Commits

Author SHA1 Message Date
Bosanac Dejan 6ce702d4cf https://issues.apache.org/jira/browse/AMQ-4005 - plugable lockers; introduce new API and refactor current KahaDB and JDBC solutions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378881 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 10:47:49 +00:00
Claus Ibsen dd2556bc91 AMQ-4004: The option maximumActive has been name a more descriptive name to not confuse end users. The old name is kept but is @deprecated to be backwards compatible.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378859 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 08:54:15 +00:00
Claus Ibsen 8fc47c6abf AMQ-4003: Add option to PooledConnectionFactory to control if connection should be created on startup or not
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378853 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 08:37:44 +00:00
Timothy A. Bish 324ab99afa additional change for: https://issues.apache.org/jira/browse/AMQ-3996
The sslEngine instance in the NIOSSLTransport needs to be updated when the handshake process completes.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378686 13f79535-47bb-0310-9956-ffa450edef68
2012-08-29 19:11:22 +00:00
Gary Tully 99be769f96 https://issues.apache.org/jira/browse/AMQ-3998 https://issues.apache.org/jira/browse/AMQ-3999 - fix regression in org.apache.activemq.bugs.AMQ3934Test - resetting batch too eagerly in old behaviour results in picking up deleted message
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378542 13f79535-47bb-0310-9956-ffa450edef68
2012-08-29 13:30:04 +00:00
Gary Tully 935265529f make test more deterministic, ensure bridge starts first time b/c remote broker is started first, may need to use a queue if there are further inconsistency problems
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378540 13f79535-47bb-0310-9956-ffa450edef68
2012-08-29 13:29:20 +00:00
Timothy A. Bish 6175dc4639 fix for: https://issues.apache.org/jira/browse/AMQ-3996
Set the transportContext property if the certificates are available.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378372 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 22:41:02 +00:00
Jonathan Anstey bcc9e02e93 Use same ServiceMix specs version as Camel
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378213 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 16:39:31 +00:00
Jonathan Anstey 795a203c03 AMQ-4001 - align commons-lang dependency
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378139 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 14:01:55 +00:00
Torsten Mielke d3ce3d8e4a Enabling support for JMX (off by default) to NetworkTestSupport
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378102 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 12:21:35 +00:00
Claus Ibsen 3a3416caa7 AMQ-3967: Fixed unit test after upgrading Camel
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378100 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 12:19:07 +00:00
Gary Tully b496c0a38c https://issues.apache.org/jira/browse/AMQ-3997 - Memory leak in activemq-pool. Apply patch from claus with thanks, removes duplicate listener registration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378098 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 12:11:58 +00:00
Gary Tully d41f40a051 https://issues.apache.org/jira/browse/AMQ-3998 https://issues.apache.org/jira/browse/AMQ-3999 - fix issue with redispatch of committed prepared transactions, unnecessary call to determin store size for durable subs and duplicate recording of message pending dispatch on an unsubscribe
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378085 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 11:42:27 +00:00
Bosanac Dejan 00bdf0044a https://issues.apache.org/jira/browse/AMQ-3986 - optimizeDurablePrefetch on ActiveMQConnectionSupport
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378057 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 10:17:58 +00:00
Bosanac Dejan 9b0316b9b4 https://issues.apache.org/jira/browse/AMQ-3980 - generic support for all web socket tuning options
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378035 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 09:24:53 +00:00
Timothy A. Bish 53f07b0a75 fix for: https://issues.apache.org/jira/browse/AMQ-3995
Remove the long and not so useful serial add test.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1377779 13f79535-47bb-0310-9956-ffa450edef68
2012-08-27 18:26:22 +00:00
Timothy A. Bish 6ce59ed1b0 fix and test for: https://issues.apache.org/jira/browse/AMQ-3992
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1377095 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 20:39:23 +00:00
Gary Tully c55f6a84d7 https://issues.apache.org/jira/browse/AMQ-3557 - Performance of consumption with JDBC persistance and Microsoft SQL Server. Fix up default value for maxRows to allign with default page size. Use a large maxPageSize via destination policy for durable subs that have sparse selectors. Same as queues with sparse selectors
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1376934 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 14:21:22 +00:00
Gary Tully 705a877981 trace temp dest recreation by state tracker
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1376513 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 14:45:17 +00:00
Bosanac Dejan 86e9527e1f https://issues.apache.org/jira/browse/AMQ-3986 - optimizeDurablePrefetch with RA adapter
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1376431 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 10:50:36 +00:00
Gary Tully 5ed1ce50da https://issues.apache.org/jira/browse/AMQ-3872 - fix up typo in blob adapter
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1376100 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 15:29:28 +00:00
Gary Tully 6c73104152 include local port in transport to string to allow correlation between client and server side transport threads based on their ports.
Appending @local-port so client side: "ActiveMQ Transport: tcp://localhost/127.0.0.1:61616@56811" thread can be correlated with broker
side: "ActiveMQ Transport: tcp:///127.0.0.1:56811@61616" which listens on local 61616

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1376038 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 13:31:20 +00:00
Timothy A. Bish 4bace216b9 updated fix: https://issues.apache.org/jira/browse/AMQ-3982
Instead of locking on the PList iterator which forces a lock on every access to hasNext we should lock down at the PageFile level in readPage making the seek and read an atomic operation.  Since many reads on a single already loaded page don't need to be synchronized we pay a higher price for locking in the specific PList case than we do buy creating this atomic read operation in PageFile. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375852 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 23:28:50 +00:00
Gary Tully ba9037ca65 https://issues.apache.org/jira/browse/AMQ-3985 - ActiveMQConnection temp advisory consumer should use asyncDispatch - can cause deadlock with slow consumers. Fix with test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375595 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 14:59:41 +00:00
Bosanac Dejan dfbdbf6a50 https://issues.apache.org/jira/browse/AMQ-3983 - osgi dependency
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375543 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 13:44:49 +00:00
Gary Tully a526a60abd avoid repated additions to the full list on dispatch, may need to revisit the pendingWakeups count on iterate, seems we will attempt to dispatch too often which is a waste of cpu in the event that there are pending messages or new sends and slow consumers, relates to: https://issues.apache.org/jira/browse/AMQ-1902
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375484 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 11:54:31 +00:00
Gary Tully 3fa927554c https://issues.apache.org/jira/browse/AMQ-3887 - have local dispatch do safe wait till remove broker setup is complete such that producer is fully created
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375459 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 10:26:24 +00:00
Gary Tully 7e206615b8 remove non portable ref to /tmp for test - https://issues.apache.org/jira/browse/AMQ-3982
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375444 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 09:29:33 +00:00
Timothy A. Bish 030d09b816 fix and test for: https://issues.apache.org/jira/browse/AMQ-3982
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375140 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 17:50:10 +00:00
Bosanac Dejan 2027c87791 RA connection factory - test prefetch is being set
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1374958 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 09:49:16 +00:00
Timothy A. Bish e49f5d9ff8 fix for: https://issues.apache.org/jira/browse/AMQ-3981
Remove the commons log reference and unused logger. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1374231 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 12:55:35 +00:00
Timothy A. Bish 3c39db8cce fix and test for: https://issues.apache.org/jira/browse/AMQ-3961
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1374229 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 12:47:37 +00:00
Bosanac Dejan c6f9db8bfc https://issues.apache.org/jira/browse/AMQ-3980 - websockets increase max size of text message
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1374226 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 12:44:42 +00:00
Bosanac Dejan faa8d79b82 https://issues.apache.org/jira/browse/AMQ-3979 - non-daemon threads in ajax servlet
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1373794 13f79535-47bb-0310-9956-ffa450edef68
2012-08-16 11:30:52 +00:00
Bosanac Dejan a60442458e https://issues.apache.org/jira/browse/AMQ-3973 - data.db not calculated in store size
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1372859 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 12:35:26 +00:00
Bosanac Dejan ce50e287ac https://issues.apache.org/jira/browse/AMQ-3972 - failover transport - don't propagate exceptions for disposed transport
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1372770 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 08:34:41 +00:00
Bosanac Dejan 38e5c0829a https://issues.apache.org/jira/browse/AMQ-3885 + https://issues.apache.org/jira/browse/AMQ-3971 - removing System.out.println()
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1372754 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 07:38:27 +00:00
Timothy A. Bish 60832c0b2d change m2e connector config
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1371814 13f79535-47bb-0310-9956-ffa450edef68
2012-08-10 19:48:43 +00:00
Timothy A. Bish 60383038d3 Test didn't need to depend on hard coded port so use :0 instead. Add some additional test cases.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1371809 13f79535-47bb-0310-9956-ffa450edef68
2012-08-10 19:01:24 +00:00
Torsten Mielke 39e20d0415 AMQ-3965: Fix for org.apache.activemq.ActiveMQMessageConsumer.java plus new JUnit test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1371722 13f79535-47bb-0310-9956-ffa450edef68
2012-08-10 14:44:36 +00:00
Bosanac Dejan fc0b359973 stop brokers after test, which should prevent DbRestartJDBCQueueMasterSlaveLeaseQuiesceTest.testVirtualTopicFailover from failing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1371706 13f79535-47bb-0310-9956-ffa450edef68
2012-08-10 14:04:58 +00:00
Timothy A. Bish e28b55c142 Don't exit the broker stop loop if you get an exception, log it and stop the rest if possible.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1371200 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 13:24:33 +00:00
Robert Davies d45dedbd23 updated to Apache Camel 2.10 - https://issues.apache.org/jira/browse/AMQ-3960
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1371147 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 10:23:43 +00:00
Timothy A. Bish 0a676e5ffb Add a shorter connectTimeout to ensure the tests don't fail because they are waiting on the reconnectMutex for to long.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1370865 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 18:01:11 +00:00
Timothy A. Bish 46e8e17295 bunp to some bugfix release versions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1370797 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 15:03:13 +00:00
Timothy A. Bish ca15308b3f method buildBackups should bail out early in the transport is stopped.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1370581 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 22:50:26 +00:00
Timothy A. Bish b6e82fec92 Test can leave a dangling BrokerSerive instance running if it get an assertion at the right time. Make sure all started brokers get stopped.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1370576 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 22:28:26 +00:00
Timothy A. Bish 205d02598d Refine the fix for: https://issues.apache.org/jira/browse/AMQ-3939
The unit test was failing on slower hardware, some backups could be missed if the transport was processing the ConnectionControl command during the stop since the buildBackups method runs from there outside the reconnectMutex and not in the thread of the taskRunner. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1370559 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 22:02:28 +00:00
Timothy A. Bish c7fcceac0e Disable use of JMX on the embedded broker, test doesn't need it.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1369148 13f79535-47bb-0310-9956-ffa450edef68
2012-08-03 18:22:56 +00:00
Gary Tully 378d7a606b https://issues.apache.org/jira/browse/AMQ-3958 - fix up for current and next few versions, highlight in the release guide
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1368861 13f79535-47bb-0310-9956-ffa450edef68
2012-08-03 10:01:44 +00:00