Apache/activemq
1
0
Fork 0
mirror of https://github.com/apache/activemq.git synced 2025-02-27 20:59:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-6301

Browse Source 
Updating ActiveMQServiceFactory to avoid using Spring DM directly and
instead use the Camel factory bean if it exists

Reverting back to Camel 2.16.3 until Spring DM is removed and Spring 4
can be used
This commit is contained in:
Christopher L. Shannon (cshannon) 2016-07-01 16:21:19 +00:00
parent 982f739e24
commit 9da728407b
2 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-osgi/pom.xml
View File

@ -64,7 +64,9 @@
org.apache.xbean.spring*;resolution:=optional;version="[3.13,5)", org.apache.xbean.spring*;resolution:=optional;version="[3.13,5)",
org.apache.xbean*;version="[3.13,5)", org.apache.xbean*;version="[3.13,5)",
javax.annotation*, javax.annotation*,
javax.jms*, !com.thoughtworks.qdox*,
org.apache.commons.logging;version="[1.2,2)";resolution:=optional,
javax.jms*;version="[1.1,3)",
javax.management*, javax.management*,
javax.transaction*, javax.transaction*,
javax.naming*;resolution:=optional, javax.naming*;resolution:=optional,

53
activemq-osgi/src/main/java/org/apache/activemq/osgi/ActiveMQServiceFactory.java
View File

@ -26,15 +26,19 @@ import java.util.Properties;
import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.spring.SpringBrokerContext; import org.apache.activemq.spring.SpringBrokerContext;
import org.apache.activemq.spring.Utils; import org.apache.activemq.spring.Utils;
import org.apache.camel.osgi.CamelContextFactoryBean;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationException; import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedServiceFactory; import org.osgi.service.cm.ManagedServiceFactory;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
public class ActiveMQServiceFactory implements ManagedServiceFactory { public class ActiveMQServiceFactory implements ManagedServiceFactory {
@ -74,14 +78,34 @@ public class ActiveMQServiceFactory implements ManagedServiceFactory {
Thread.currentThread().setContextClassLoader(BrokerService.class.getClassLoader()); Thread.currentThread().setContextClassLoader(BrokerService.class.getClassLoader());
Resource resource = Utils.resourceFromString(config); Resource resource = Utils.resourceFromString(config);
// when camel is embedded it needs a bundle context ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(
OsgiBundleXmlApplicationContext ctx = new OsgiBundleXmlApplicationContext(new String[]{resource.getURL().toExternalForm()}) { new String[]{resource.getURL().toExternalForm()}, false);
@Override
protected void initBeanDefinitionReader(XmlBeanDefinitionReader reader) { if (isCamelContextFactoryBeanExist()) {
reader.setValidating(false);
} ctx.addBeanFactoryPostProcessor(new BeanFactoryPostProcessor() {
};
ctx.setBundleContext(bundleContext); @Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
beanFactory.addBeanPostProcessor(new BeanPostProcessor() {
@Override
public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
if (bean instanceof CamelContextFactoryBean) {
((CamelContextFactoryBean) bean).setBundleContext(bundleContext);
}
return bean;
}
@Override
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
return bean;
}
});
}
});
}
// Handle properties in configuration // Handle properties in configuration
PropertyPlaceholderConfigurer configurator = new PropertyPlaceholderConfigurer(); PropertyPlaceholderConfigurer configurator = new PropertyPlaceholderConfigurer();
@ -121,6 +145,15 @@ public class ActiveMQServiceFactory implements ManagedServiceFactory {
} }
} }
private boolean isCamelContextFactoryBeanExist() {
try {
Class.forName("org.apache.camel.osgi.CamelContextFactoryBean");
return true;
} catch (ClassNotFoundException e) {
return false;
}
}
@Override @Override
synchronized public void deleted(String pid) { synchronized public void deleted(String pid) {
BrokerService broker = brokers.get(pid); BrokerService broker = brokers.get(pid);