Author: eglynn
Date: Fri Dec 11 16:48:10 2009
New Revision: 889691
URL: http://svn.apache.org/viewvc?rev=889691&view=rev
Log:
Applying patch for [SMX4-444] Add camel-activemq feature, on behalf of Sergey Beryozkin
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=889691&r1=889690&r2=889691&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Fri Dec 11 16:48:10 2009
@@ -557,6 +557,11 @@
<version>${activemq.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-camel</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<version>${xbean.version}</version>
@@ -953,6 +958,7 @@
<feature>web</feature>
<feature>cxf-nmr</feature>
<feature>cxf-osgi</feature>
+ <feature>camel-activemq</feature>
<!-- ServiceMix components -->
<feature>servicemix-cxf-bc</feature>
<feature>servicemix-file</feature>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=889691&r1=889690&r2=889691&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Fri Dec
11 16:48:10 2009
@@ -98,22 +98,31 @@
<bundle>mvn:org.apache.servicemix.cxf/org.apache.servicemix.cxf.transport.nmr/${version}</bundle>
<bundle>mvn:org.apache.servicemix.cxf/org.apache.servicemix.cxf.binding.nmr/${version}</bundle>
</feature>
+
<feature name="camel" version="${camel.version}">
<feature version="${camel.version}">camel-core</feature>
<feature version="${camel.version}">camel-osgi</feature>
<feature version="${camel.version}">camel-spring</feature>
</feature>
- <!--
- -
- - Examples
- -
- -->
<feature name="camel-nmr" version="${version}">
<feature version="${camel.version}">camel</feature>
<feature version="${servicemix.nmr.version}">nmr</feature>
<bundle>mvn:org.apache.servicemix.camel/org.apache.servicemix.camel.component/${version}</bundle>
</feature>
+
+ <feature name="camel-activemq" version="${version}">
+ <feature version="${activemq.version}">activemq</feature>
+ <feature version="${camel.version}">camel-jms</feature>
+ <bundle>mvn:org.apache.activemq/activemq-camel/${activemq.version}</bundle>
+ </feature>
+
+ <!--
+ -
+ - Examples
+ -
+ -->
+
<feature name="examples-cxf-osgi" version="${version}">
<feature version="${version}">cxf-osgi</feature>
<bundle>mvn:org.apache.servicemix.examples/cxf-osgi/${version}</bundle>
|