Author: dain
Date: Wed Sep 19 19:27:46 2007
New Revision: 577511
URL: http://svn.apache.org/viewvc?rev=577511&view=rev
Log:
Merging 577418 from trunk
Disable activemq jmx usage as it causes Tomcat shutdown to hang
Modified:
openejb/branches/3.0-beta-1/container/openejb-core/src/main/resources/default.openejb.conf
Modified:
openejb/branches/3.0-beta-1/container/openejb-core/src/main/resources/default.openejb.conf
URL:
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/container/openejb-core/src/main/resources/default.openejb.conf?rev=577511&r1=577510&r2=577511&view=diff
==============================================================================
---
openejb/branches/3.0-beta-1/container/openejb-core/src/main/resources/default.openejb.conf
(original)
+++
openejb/branches/3.0-beta-1/container/openejb-core/src/main/resources/default.openejb.conf
Wed Sep 19 19:27:46 2007
@@ -155,7 +155,7 @@
<Resource id="Default JMS Resource Adapter">
# Broker configuration
- BrokerXmlConfig broker:(tcp://localhost:61616)
+ BrokerXmlConfig broker:(tcp://localhost:61616)?useJmx=false
# Broker address
ServerUrl vm://localhost?async=true
