Author: davsclaus
Date: Mon Jun 11 08:51:34 2012
New Revision: 1348754
URL: http://svn.apache.org/viewvc?rev=1348754&view=rev
Log:
CAMEL-5347: Added camel-mqtt to release kit, and in features.
Added:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMqttTest.java
- copied, changed from r1348721,
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbTest.java
Modified:
camel/trunk/apache-camel/pom.xml
camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/apache-camel/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=1348754&r1=1348753&r2=1348754&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Mon Jun 11 08:51:34 2012
@@ -328,6 +328,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-mqtt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-msv</artifactId>
</dependency>
<dependency>
Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=1348754&r1=1348753&r2=1348754&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Mon Jun 11
08:51:34 2012
@@ -103,6 +103,7 @@
<include>org.apache.camel:camel-mina</include>
<include>org.apache.camel:camel-mina2</include>
<include>org.apache.camel:camel-mongodb</include>
+ <include>org.apache.camel:camel-mqtt</include>
<include>org.apache.camel:camel-msv</include>
<include>org.apache.camel:camel-mvel</include>
<include>org.apache.camel:camel-mybatis</include>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1348754&r1=1348753&r2=1348754&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Jun 11 08:51:34 2012
@@ -92,6 +92,7 @@
<hapi-version>1.2</hapi-version>
<hawtbuf-version>1.9</hawtbuf-version>
<hawtdb-version>1.6</hawtdb-version>
+ <hawtdispatch-version>1.11</hawtdispatch-version>
<hazelcast-version>2.0.2</hazelcast-version>
<hbase-version>0.90.5</hbase-version>
<hibernate-version>3.6.10.Final</hibernate-version>
@@ -613,6 +614,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-mqtt</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-msv</artifactId>
<version>${project.version}</version>
</dependency>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1348754&r1=1348753&r2=1348754&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Mon
Jun 11 08:51:34 2012
@@ -557,6 +557,14 @@
<feature version='${project.version}'>camel-core</feature>
<feature version='${project.version}'>camel-jackson</feature>
</feature>
+ <feature name='camel-mqtt' version='${project.version}' resolver='(obr)'
start-level='50'>
+ <bundle
dependency='true'>mvn:org.fusesource.mqtt-client/mqtt-client/${mqtt-client-version}</bundle>
+ <bundle
dependency='true'>mvn:org.fusesource.hawtdispatch/hawtdispatch/${hawtdispatch-version}</bundle>
+ <bundle
dependency='true'>mvn:org.fusesource.hawtdispatch/hawtdispatch-transport/${hawtdispatch-version}</bundle>
+ <bundle
dependency='true'>mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-mqtt/${project.version}</bundle>
+ <feature version='${project.version}'>camel-core</feature>
+ </feature>
<feature name='camel-msv' version='${project.version}' resolver='(obr)'
start-level='50'>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
Copied:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMqttTest.java
(from r1348721,
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMqttTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMqttTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbTest.java&r1=1348721&r2=1348754&rev=1348754&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMongodbTest.java
(original)
+++
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMqttTest.java
Mon Jun 11 08:51:34 2012
@@ -23,9 +23,9 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-public class CamelMongodbTest extends AbstractFeatureTest {
+public class CamelMqttTest extends AbstractFeatureTest {
- public static final String COMPONENT = extractName(CamelMongodbTest.class);
+ public static final String COMPONENT = extractName(CamelMqttTest.class);
@Test
public void test() throws Exception {