activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1446543 - in /activemq/trunk: activemq-camel/pom.xml activemq-karaf/src/main/resources/features.xml activemq-osgi/src/main/java/org/apache/activemq/osgi/ActiveMQServiceFactory.java
Date Fri, 15 Feb 2013 11:57:32 GMT
Author: dejanb
Date: Fri Feb 15 11:57:31 2013
New Revision: 1446543

URL: http://svn.apache.org/r1446543
Log:
https://issues.apache.org/jira/browse/AMQ-4317 - activemq-camel feature

Modified:
    activemq/trunk/activemq-camel/pom.xml
    activemq/trunk/activemq-karaf/src/main/resources/features.xml
    activemq/trunk/activemq-osgi/src/main/java/org/apache/activemq/osgi/ActiveMQServiceFactory.java

Modified: activemq/trunk/activemq-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/pom.xml?rev=1446543&r1=1446542&r2=1446543&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/pom.xml (original)
+++ activemq/trunk/activemq-camel/pom.xml Fri Feb 15 11:57:31 2013
@@ -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>

Modified: activemq/trunk/activemq-karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features.xml?rev=1446543&r1=1446542&r2=1446543&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Fri Feb 15 11:57:31 2013
@@ -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>
 

Modified: activemq/trunk/activemq-osgi/src/main/java/org/apache/activemq/osgi/ActiveMQServiceFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-osgi/src/main/java/org/apache/activemq/osgi/ActiveMQServiceFactory.java?rev=1446543&r1=1446542&r2=1446543&view=diff
==============================================================================
--- activemq/trunk/activemq-osgi/src/main/java/org/apache/activemq/osgi/ActiveMQServiceFactory.java
(original)
+++ activemq/trunk/activemq-osgi/src/main/java/org/apache/activemq/osgi/ActiveMQServiceFactory.java
Fri Feb 15 11:57:31 2013
@@ -24,10 +24,8 @@ import org.osgi.service.cm.Configuration
 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 impl
             };
 
             // 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();



Mime
View raw message