Commit Graph

5756 Commits

Author SHA1 Message Date
Gary Tully ac54a611f3 ensure broker stop ocurrs after subs connected and add defensive check to close identified by one failure scenario
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1296396 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 19:15:45 +00:00
Gary Tully d2f8eded57 fix timing issue with test, fails under load
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1296368 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 18:31:45 +00:00
Gary Tully 9b7347087d make test more deterministic
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1296326 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 17:30:44 +00:00
Gary Tully df8d1e824d https://issues.apache.org/jira/browse/AMQ-3749 - Composite destinations break simple authorisation through role aggregation. additional tests and fix - fix broken test, expecting wrong behaviour
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1296204 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 13:53:31 +00:00
Torsten Mielke 14110f52eb AMQ-3754: Updated org.apache.activemq.transport.vm.VmTransportNetworkBrokerTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1296194 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 13:20:14 +00:00
Gary Tully 783ba853aa fix intermittent hang if all threads do not complete on time
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1296157 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 11:46:31 +00:00
Torsten Mielke 3a84de9199 AMQ-3752: repeated call to PooledConnection.setClientID() with the same client id are ignored and don't raise an exception.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1296094 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 09:03:23 +00:00
Robert Davies e2325f5d4f Fix for https://issues.apache.org/jira/browse/AMQ-3748
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1295672 13f79535-47bb-0310-9956-ffa450edef68
2012-03-01 16:58:02 +00:00
Robert Davies f4d4c3b4ce Fix for https://issues.apache.org/jira/browse/AMQ-3750 - add hint to storage of messages to enable concurrent store and dispatch
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1295662 13f79535-47bb-0310-9956-ffa450edef68
2012-03-01 16:37:19 +00:00
Gary Tully 5dda6e6fee https://issues.apache.org/jira/browse/AMQ-3749 - Composite destinations break simple authorisation through role aggregation. additional tests and fix - ldap did need some work
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1295661 13f79535-47bb-0310-9956-ffa450edef68
2012-03-01 16:36:12 +00:00
Gary Tully 9a7443a137 https://issues.apache.org/jira/browse/AMQ-3749 - Composite destinations break simple authorisation through role aggregation. additional tests and fix, the union of the roles for composite destinations provides the auth list
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1295545 13f79535-47bb-0310-9956-ffa450edef68
2012-03-01 13:06:45 +00:00
Gary Tully 503e1dc15e https://issues.apache.org/jira/browse/AMQ-3747 - Syntax errors are not showing up in the log when the broker is started in the background. fix by logging a fatalbeanexception on context creation before rethrow
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1295138 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 14:45:32 +00:00
Gary Tully 0d8ce9f87c add activemq-camel feature, remove invalid url param from mvn war for console
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1295072 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 12:14:01 +00:00
Gary Tully 14c1766843 https://issues.apache.org/jira/browse/AMQ-3743 - activemq-web-console WAR with SNAPSHOT dependencies breaks osgi Bundle-ClassPath in manifest. Make use of the war plugin outputFileNameMapping to ensure the timestamp is dropped to match the bundle-classpath
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1294359 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 22:14:54 +00:00
Timothy A. Bish e426de8c32 fix for: https://issues.apache.org/jira/browse/AMQ-3742 with supplied unit test patch applied.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1294342 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 21:37:03 +00:00
Timothy A. Bish c0cf753e19 apply fix for: https://issues.apache.org/jira/browse/AMQ-3740
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1294318 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 20:44:17 +00:00
Timothy A. Bish 46ccaafcfc fix for: https://issues.apache.org/jira/browse/AMQ-3693
fix for: https://issues.apache.org/jira/browse/AMQ-3508

Upgrades Jetty to v7.6.1

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1293432 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 21:36:39 +00:00
Timothy A. Bish a259c12c97 Fix the failing test case, was closing the stomp socket before the StompTransport had time to read and dispatch incoming commands.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1292982 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 22:10:58 +00:00
Gary Tully 2290502bc9 https://issues.apache.org/jira/browse/AMQ-3737 - Possible leak in ManangedRegionBroker unregisterDestination. relates to: https://issues.apache.org/activemq/browse/AMQ-2741 - a leak indeed, or more than a mbean
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1292858 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 17:13:37 +00:00
Timothy A. Bish 14350af90c https://issues.apache.org/jira/browse/AMQ-3734
https://issues.apache.org/jira/browse/AMQ-3735

Add the new ACTIVEMQ_CONF and ACTIVEMQ_DATA defaults to the wrapper conf files.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1292809 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 14:14:24 +00:00
Timothy A. Bish f5dcc9dfbf fix for: https://issues.apache.org/jira/browse/AMQ-3734
Adds username to some MBeans when enabled in BrokerService to allow for tracking of the authenticated user of connections and other resources.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1292599 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 00:40:13 +00:00
Timothy A. Bish 757107d7aa https://issues.apache.org/jira/browse/AMQ-3248
For backwards compat let the vars ACTIVEMQ_CONFIG_DIR and ACTIVEMQ_DATA_DIR still apply if the new ACTIVEMQ_CONF and ACTIVEMQ_DATA aren't set.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1292470 13f79535-47bb-0310-9956-ffa450edef68
2012-02-22 19:41:48 +00:00
Hiram R. Chirino a7873fc8ce Set the java.io.tmpdir to be the ${ACTIVEM_BASE}/tmp directory. This way it's easy to find and delete temp files (like the ones jetty uses).
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1292413 13f79535-47bb-0310-9956-ffa450edef68
2012-02-22 17:35:37 +00:00
Timothy A. Bish b5e294372f https://issues.apache.org/jira/browse/AMQ-3248
make some fixes to the activemq script.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1292403 13f79535-47bb-0310-9956-ffa450edef68
2012-02-22 17:26:05 +00:00
Timothy A. Bish fb06ca48c2 Up Camel version to 2.9.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1292300 13f79535-47bb-0310-9956-ffa450edef68
2012-02-22 14:17:30 +00:00
Timothy A. Bish 3221b16221 fix for: https://issues.apache.org/jira/browse/AMQ-3731
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1291465 13f79535-47bb-0310-9956-ffa450edef68
2012-02-20 21:47:59 +00:00
Gary Tully e32ff5c7f4 https://issues.apache.org/jira/browse/AMQ-3729 - Stomp wireformat and codec block on telnet CRLF CRLF header separator. fix up telnet support, additional test, impacts https://issues.apache.org/jira/browse/AMQ-2583 and https://issues.apache.org/jira/browse/AMQ-3449
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1291299 13f79535-47bb-0310-9956-ffa450edef68
2012-02-20 14:58:23 +00:00
Timothy A. Bish df19a382c9 fix for: https://issues.apache.org/jira/browse/AMQ-2834
Adds some checks on store limit vs journal max file size similar to the Temp Store limit checks

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1245777 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 21:50:45 +00:00
Timothy A. Bish 3a561cc8c7 fix for: https://issues.apache.org/jira/browse/AMQ-3248
Adds new variables for activemq.conf and activemq.data to allow for easy externalization of configuration and data files.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1245654 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 16:57:35 +00:00
Gary Tully 9f0a673e36 order is not guarenteed with multiple consumers, just validate quantity
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1245408 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 11:37:12 +00:00
Timothy A. Bish 896de22bf7 apply patch for: https://issues.apache.org/jira/browse/AMQ-3722
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1244993 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 14:22:33 +00:00
Gary Tully 49dd85c5e7 reduce default number of restarts and down time to reduce duration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1244976 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 13:53:32 +00:00
Gary Tully cc7ea7f31f reduce test duration from crazy 30 minutes, validate temp store being used
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1244974 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 13:40:47 +00:00
Timothy A. Bish 08ae7770bb fix: https://issues.apache.org/jira/browse/AMQ-3721
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1244809 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 00:40:55 +00:00
Timothy A. Bish 97ae32388c fix for: https://issues.apache.org/jira/browse/AMQ-3714 lazy init the Scheduler object in ActiveMQConnection.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1244796 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 00:02:15 +00:00
Gary Tully 98b7dcdd1d fix intermittent failure, consume messages from all destinations, sorts out the composite case so that there are no dangling messages
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1244443 13f79535-47bb-0310-9956-ffa450edef68
2012-02-15 11:21:43 +00:00
Timothy A. Bish 1638801522 Add an initial port of ConcurrentProducerDurableConsumerTest to performance test Queue dispatch.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1244290 13f79535-47bb-0310-9956-ffa450edef68
2012-02-15 00:29:39 +00:00
Timothy A. Bish a3060e79d9 https://issues.apache.org/jira/browse/AMQ-3706
Don't send a URI to the client that equals "null" when the BrokerInfo has no set Broker URI, that sends the failover transport into an infinite reconnect cycle.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1244221 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 21:36:04 +00:00
Gary Tully 8bff980ec2 remove typo ref to backport timeunit - https://issues.apache.org/jira/browse/AMQ-3684
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1244117 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 16:38:08 +00:00
Gary Tully 2a87ad5b3e https://issues.apache.org/jira/browse/AMQ-3716: NetworkBridge with conduitSubscriptions=true will leak consumer info in org.apache.activemq.network.DemandForwardingBridgeSupport#subscriptionMapByRemoteId map. fix with test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1244116 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 16:37:29 +00:00
Timothy A. Bish 456005bf13 Mark this as @Deprecated as its not used anymore in AMQ and should be removed.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1243716 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 22:12:11 +00:00
Timothy A. Bish ad585dc4b0 Refactoed the VMTransport for: https://issues.apache.org/jira/browse/AMQ-3684
Adds a test for basic functionality tests on the VMTransport.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1243706 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 21:56:50 +00:00
Timothy A. Bish 73a30f6991 apply updated fix for: https://issues.apache.org/jira/browse/AMQ-3715
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1243697 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 21:14:31 +00:00
Timothy A. Bish de08e4b56c apply fix for: https://issues.apache.org/jira/browse/AMQ-3715
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1243652 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 18:51:18 +00:00
Gary Tully ace122aede ensure test failure does not block build
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1243485 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 11:53:28 +00:00
Gary Tully 9a22fe586d ensure frames are null terminated
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1243484 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 11:52:11 +00:00
Gary Tully 5a74d56cc1 https://issues.apache.org/jira/browse/AMQ-3684 - revert initialisation order, thread can be eager and needs complete state so it must be inited last
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1243334 13f79535-47bb-0310-9956-ffa450edef68
2012-02-12 21:09:12 +00:00
Gary Tully bc8441bebc https://issues.apache.org/jira/browse/AMQ-3684 - resolve deadlock on blocked oneway, revise sync and lazy init, remove use of valve
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1242912 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 20:19:44 +00:00
Gary Tully 93a379fe3c https://issues.apache.org/jira/browse/AMQ-3653 - tidy up stomptest and resolve content length for stomp+nio, resolve break of stompnio and stompniossl tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1242911 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 20:18:50 +00:00
Timothy A. Bish 33f9f2968b fix for: https://issues.apache.org/jira/browse/AMQ-1899
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1242793 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 14:41:44 +00:00