Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-4317 - activemq-camel feature 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1446543 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2013-02-15 11:57:31 +00:00
parent b7c32d924a
commit cfe9e151c0
3 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
activemq-camel/pom.xml
View File

@ -31,6 +31,9 @@
<packaging>bundle</packaging>
<properties>
<activemq.osgi.import.pkg>
org.springframework.jms*;version="[3,4)",
</activemq.osgi.import.pkg>
<activemq.osgi.export>
org.apache.activemq.camel*;version=${project.version};-noimport:=true
</activemq.osgi.export>

18
activemq-karaf/src/main/resources/features.xml
View File

@ -33,18 +33,6 @@
<bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
</feature>
<feature resolver="(obr)" description="Spring support" version="3.1.3.RELEASE" name="spring">
<details>Spring Support</details>
<bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_6</bundle>
<bundle start-level="30">mvn:org.springframework/spring-core/3.1.3.RELEASE</bundle>
<bundle start-level="30">mvn:org.springframework/spring-asm/3.1.3.RELEASE</bundle>
<bundle start-level="30">mvn:org.springframework/spring-expression/3.1.3.RELEASE</bundle>
<bundle start-level="30">mvn:org.springframework/spring-beans/3.1.3.RELEASE</bundle>
<bundle start-level="30">mvn:org.springframework/spring-aop/3.1.3.RELEASE</bundle>
<bundle start-level="30">mvn:org.springframework/spring-context/3.1.3.RELEASE</bundle>
<bundle start-level="30">mvn:org.springframework/spring-context-support/3.1.3.RELEASE</bundle>
</feature>
<!-- All bundles needed by the broker -->
<feature name="activemq" description="ActiveMQ broker libraries" version="${project.version}" resolver="(obr)" start-level="50">
<feature version="${project.version}">activemq-client</feature>
@ -89,11 +77,7 @@
<feature name="activemq-camel" version="${project.version}" resolver="(obr)" start-level="50">
<feature version="${project.version}">activemq-client</feature>
<feature version="[3,4)">spring</feature>
<bundle start-level="30">mvn:org.springframework/spring-jms/3.1.3.RELEASE</bundle>
<bundle start-level="30">mvn:org.springframework/spring-tx/3.1.3.RELEASE</bundle>
<feature version="${camel-version-range}">camel-core</feature>
<bundle >mvn:org.apache.camel/camel-jms/${camel-version}</bundle>
<feature version="${camel-version-range}">camel-jms</feature>
<bundle>mvn:org.apache.activemq/activemq-camel/${project.version}</bundle>
</feature>

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

@ -24,10 +24,8 @@ import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedServiceFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.core.io.Resource;
import java.util.*;
@ -72,8 +70,8 @@ public class ActiveMQServiceFactory implements ManagedServiceFactory {
};
// Handle properties in configuration
PropertySourcesPlaceholderConfigurer configurator =
new PropertySourcesPlaceholderConfigurer();
PropertyPlaceholderConfigurer configurator =
new PropertyPlaceholderConfigurer();
//convert dictionary to properties. Is there a better way?
Properties props = new Properties();