Author: jstrachan
Date: Mon Jul 3 08:23:32 2006
New Revision: 418790
URL: http://svn.apache.org/viewvc?rev=418790&view=rev
Log:
removed dependency on XBeanBrokerService so that a regular Spring XML file can
be used that just instantiates BrokerService directly to fix AMQ-790
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java?rev=418790&r1=418789&r2=418790&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java
Mon Jul 3 08:23:32 2006
@@ -39,9 +39,9 @@
String uri = config.getSchemeSpecificPart();
ClassPathXmlApplicationContext context = new
ClassPathXmlApplicationContext(uri);
- XBeanBrokerService broker = null;
+ BrokerService broker = null;
try {
- broker = (XBeanBrokerService) context.getBean("broker");
+ broker = (BrokerService) context.getBean("broker");
}
catch (BeansException e) {
}
@@ -51,7 +51,7 @@
String[] names = context.getBeanNamesForType(BrokerService.class);
for (int i = 0; i < names.length; i++) {
String name = names[i];
- broker = (XBeanBrokerService) context.getBean(name);
+ broker = (BrokerService) context.getBean(name);
if (broker != null) {
break;
}