You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ra...@apache.org on 2012/06/08 13:41:35 UTC
svn commit: r1348030 - in /camel/trunk: components/ components/camel-mqtt/
components/camel-mqtt/src/ components/camel-mqtt/src/main/
components/camel-mqtt/src/main/java/ components/camel-mqtt/src/main/java/org/
components/camel-mqtt/src/main/java/org/...
Author: rajdavies
Date: Fri Jun 8 11:41:34 2012
New Revision: 1348030
URL: http://svn.apache.org/viewvc?rev=1348030&view=rev
Log:
added MQTT Component for https://issues.apache.org/jira/browse/CAMEL-5347
Added:
camel/trunk/components/camel-mqtt/
camel/trunk/components/camel-mqtt/pom.xml
camel/trunk/components/camel-mqtt/src/
camel/trunk/components/camel-mqtt/src/main/
camel/trunk/components/camel-mqtt/src/main/java/
camel/trunk/components/camel-mqtt/src/main/java/org/
camel/trunk/components/camel-mqtt/src/main/java/org/apache/
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTComponent.java (with props)
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java (with props)
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConsumer.java (with props)
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java (with props)
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java (with props)
camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/package.html
camel/trunk/components/camel-mqtt/src/main/resources/
camel/trunk/components/camel-mqtt/src/main/resources/META-INF/
camel/trunk/components/camel-mqtt/src/main/resources/META-INF/LICENSE.txt (with props)
camel/trunk/components/camel-mqtt/src/main/resources/META-INF/NOTICE.txt (with props)
camel/trunk/components/camel-mqtt/src/main/resources/META-INF/services/
camel/trunk/components/camel-mqtt/src/main/resources/META-INF/services/org/
camel/trunk/components/camel-mqtt/src/main/resources/META-INF/services/org/apache/
camel/trunk/components/camel-mqtt/src/main/resources/META-INF/services/org/apache/camel/
camel/trunk/components/camel-mqtt/src/main/resources/META-INF/services/org/apache/camel/component/
camel/trunk/components/camel-mqtt/src/main/resources/META-INF/services/org/apache/camel/component/mqtt
camel/trunk/components/camel-mqtt/src/test/
camel/trunk/components/camel-mqtt/src/test/java/
camel/trunk/components/camel-mqtt/src/test/java/org/
camel/trunk/components/camel-mqtt/src/test/java/org/apache/
camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/
camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/
camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/
camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTBaseTest.java (with props)
camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConfigurationTest.java (with props)
camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConsumerTest.java (with props)
camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTProducerTest.java (with props)
camel/trunk/components/camel-mqtt/src/test/resources/
camel/trunk/components/camel-mqtt/src/test/resources/log4j.properties
camel/trunk/components/camel-mqtt/src/test/resources/test-options.properties
Modified:
camel/trunk/components/pom.xml
camel/trunk/parent/pom.xml
Added: camel/trunk/components/camel-mqtt/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/pom.xml?rev=1348030&view=auto
==============================================================================
--- camel/trunk/components/camel-mqtt/pom.xml (added)
+++ camel/trunk/components/camel-mqtt/pom.xml Fri Jun 8 11:41:34 2012
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>2.10-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <artifactId>camel-mqtt</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: MQTT</name>
+ <description>Camel MQTT client</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.component.mqtt.*</camel.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.mqtt-client</groupId>
+ <artifactId>mqtt-client</artifactId>
+ <version>${mqtt-client-version}</version>
+ </dependency>
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <forkMode>perTest</forkMode>
+ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ <excludes>
+ <exclude>**/MQTTProducerTest.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}/activemq-data</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTComponent.java?rev=1348030&view=auto
==============================================================================
--- camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTComponent.java (added)
+++ camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTComponent.java Fri Jun 8 11:41:34 2012
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mqtt;
+
+import java.util.Map;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.impl.DefaultComponent;
+
+/**
+ * MQTT component
+ */
+public class MQTTComponent extends DefaultComponent {
+
+ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters)
+ throws Exception {
+
+ MQTTConfiguration configuration = new MQTTConfiguration();
+
+ // and then override from parameters
+ setProperties(configuration, parameters);
+
+ MQTTEndpoint endpoint = new MQTTEndpoint(uri, this, configuration);
+ return endpoint;
+ }
+}
Propchange: camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java?rev=1348030&view=auto
==============================================================================
--- camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java (added)
+++ camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java Fri Jun 8 11:41:34 2012
@@ -0,0 +1,153 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mqtt;
+
+import org.fusesource.mqtt.client.MQTT;
+import org.fusesource.mqtt.client.QoS;
+
+public class MQTTConfiguration extends MQTT {
+ /**
+ * These a properties that are looked for in an Exchange - to publish to
+ */
+ private String mqttTopicPropertyName = "MQTTTopicPropertyName";
+ private String mqttRetainPropertyName = "MQTTRetain";
+ private String mqttQosPropertyName = "MQTTQos";
+
+ /**
+ * These are set on the Endpoint - together with properties inheritted from MQTT
+ */
+ private String subscribeTopicName = "";
+ private String publishTopicName = "camel/mqtt/test";
+ private String qualityOfService = QoS.AT_LEAST_ONCE.name();
+
+ private int connectWaitInSeconds = 10;
+ private int disconnectWaitInSeconds = 5;
+ private int sendWaitInSeconds = 5;
+ private boolean byDefaultRetain = false;
+ private QoS qos = QoS.AT_LEAST_ONCE;
+
+
+ public String getQualityOfService() {
+ return qualityOfService;
+ }
+
+ public void setQualityOfService(String qualityOfService) {
+ this.qos = getQoS(qualityOfService);
+ this.qualityOfService = qualityOfService;
+ }
+
+ public QoS getQoS() {
+ return qos;
+ }
+
+ public String getSubscribeTopicName() {
+ return subscribeTopicName;
+ }
+
+ public void setSubscribeTopicName(String subscribeTopicName) {
+ this.subscribeTopicName = subscribeTopicName;
+ }
+
+ public String getPublishTopicName() {
+ return publishTopicName;
+ }
+
+ public void setPublishTopicName(String publishTopicName) {
+ this.publishTopicName = publishTopicName;
+ }
+
+ public String getMqttTopicPropertyName() {
+ return mqttTopicPropertyName;
+ }
+
+ public void setMqttTopicPropertyName(String mqttTopicPropertyName) {
+ this.mqttTopicPropertyName = mqttTopicPropertyName;
+ }
+
+ public String getMqttRetainPropertyName() {
+ return mqttRetainPropertyName;
+ }
+
+ public void setMqttRetainPropertyName(String mqttRetainPropertyName) {
+ this.mqttRetainPropertyName = mqttRetainPropertyName;
+ }
+
+ public String getMqttQosPropertyName() {
+ return mqttQosPropertyName;
+ }
+
+ public void setMqttQosPropertyName(String mqttQosPropertyName) {
+ this.mqttQosPropertyName = mqttQosPropertyName;
+ }
+
+
+ public int getConnectWaitInSeconds() {
+ return connectWaitInSeconds;
+ }
+
+ public void setConnectWaitInSeconds(int connectWaitInSeconds) {
+ this.connectWaitInSeconds = connectWaitInSeconds;
+ }
+
+ public int getDisconnectWaitInSeconds() {
+ return disconnectWaitInSeconds;
+ }
+
+ public void setDisconnectWaitInSeconds(int disconnectWaitInSeconds) {
+ this.disconnectWaitInSeconds = disconnectWaitInSeconds;
+ }
+
+ public int getSendWaitInSeconds() {
+ return sendWaitInSeconds;
+ }
+
+ public void setSendWaitInSeconds(int sendWaitInSeconds) {
+ this.sendWaitInSeconds = sendWaitInSeconds;
+ }
+
+
+ public boolean isByDefaultRetain() {
+ return byDefaultRetain;
+ }
+
+ public void setByDefaultRetain(boolean byDefaultRetain) {
+ this.byDefaultRetain = byDefaultRetain;
+ }
+
+
+ static QoS getQoS(String qualityOfService) {
+
+ for (QoS q : QoS.values()) {
+ if (q.name().equalsIgnoreCase(qualityOfService)) {
+ return q;
+ }
+ }
+ if (qualityOfService.equalsIgnoreCase("ATMOSTONCE")) {
+ return QoS.AT_MOST_ONCE;
+ }
+ if (qualityOfService.equalsIgnoreCase("EXACTLYONCE")) {
+ return QoS.EXACTLY_ONCE;
+ }
+ if (qualityOfService.equalsIgnoreCase("ATLEASTONCE")) {
+ return QoS.AT_LEAST_ONCE;
+ }
+ throw new IllegalArgumentException("There is no QoS with name " + qualityOfService);
+ }
+}
+
+
+
Propchange: camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConsumer.java?rev=1348030&view=auto
==============================================================================
--- camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConsumer.java (added)
+++ camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConsumer.java Fri Jun 8 11:41:34 2012
@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mqtt;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.impl.DefaultConsumer;
+
+public class MQTTConsumer extends DefaultConsumer {
+ public MQTTConsumer(MQTTEndpoint endpoint, Processor processor) {
+ super(endpoint, processor);
+ }
+
+ protected void doStart() throws Exception {
+ ((MQTTEndpoint) getEndpoint()).addConsumer(this);
+ super.doStart();
+ }
+
+ protected void doStop() throws Exception {
+ ((MQTTEndpoint) getEndpoint()).removeConsumer(this);
+ super.doStop();
+ }
+
+ void processExchange(Exchange exchange) throws Exception {
+ getProcessor().process(exchange);
+ }
+}
Propchange: camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTConsumer.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java?rev=1348030&view=auto
==============================================================================
--- camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java (added)
+++ camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java Fri Jun 8 11:41:34 2012
@@ -0,0 +1,195 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mqtt;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.Consumer;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.impl.DefaultEndpoint;
+import org.fusesource.hawtbuf.Buffer;
+import org.fusesource.hawtbuf.UTF8Buffer;
+import org.fusesource.mqtt.client.Callback;
+import org.fusesource.mqtt.client.CallbackConnection;
+import org.fusesource.mqtt.client.Listener;
+import org.fusesource.mqtt.client.Promise;
+import org.fusesource.mqtt.client.QoS;
+import org.fusesource.mqtt.client.Topic;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Twitter direct endpoint
+ */
+public class MQTTEndpoint extends DefaultEndpoint {
+ private static final transient Logger LOG = LoggerFactory.getLogger(MQTTEndpoint.class);
+
+ private CallbackConnection connection;
+ private final MQTTConfiguration configuration;
+ private final List<MQTTConsumer> consumers = new CopyOnWriteArrayList<MQTTConsumer>();
+
+ public MQTTEndpoint(String uri, org.apache.camel.component.mqtt.MQTTComponent component, MQTTConfiguration properties) {
+ super(uri, component);
+ this.configuration = properties;
+ }
+
+ @Override
+ public Consumer createConsumer(Processor processor) throws Exception {
+ MQTTConsumer consumer = new MQTTConsumer(this, processor);
+ return consumer;
+ }
+
+ @Override
+ public Producer createProducer() throws Exception {
+ MQTTProducer producer = new MQTTProducer(this);
+ return producer;
+ }
+
+ public MQTTConfiguration getConfiguration() {
+ return configuration;
+ }
+
+
+ @Override
+ protected void doStart() throws Exception {
+ super.doStart();
+ connection = configuration.callbackConnection();
+
+ connection.listener(new Listener() {
+ public void onConnected() {
+ LOG.info("MQTT Endpoint Connected to " + configuration.getHost());
+ }
+
+ public void onDisconnected() {
+ LOG.debug("MQTT Connection disconnected");
+ }
+
+ public void onPublish(UTF8Buffer topic, Buffer body, Runnable ack) {
+
+ if (!consumers.isEmpty()) {
+ Exchange exchange = createExchange();
+ exchange.getIn().setBody(body.getData());
+ exchange.setProperty(configuration.getMqttTopicPropertyName(), topic.toString());
+ for (MQTTConsumer consumer : consumers) {
+ try {
+ consumer.processExchange(exchange);
+ } catch (Exception e) {
+ LOG.error("Failed to process exchange ", exchange);
+ }
+ }
+ }
+ if (ack != null) {
+ ack.run();
+ }
+
+ }
+
+ public void onFailure(Throwable value) {
+ connection.disconnect(new Callback<Void>() {
+ public void onSuccess(Void value) {
+ }
+
+ public void onFailure(Throwable value) {
+ LOG.debug("Failed to disconnect from " + configuration.getHost());
+ }
+ });
+ }
+ });
+ final Promise promise = new Promise();
+ connection.connect(new Callback<Void>() {
+ public void onSuccess(Void value) {
+ String subscribeTopicName = configuration.getSubscribeTopicName();
+ subscribeTopicName = subscribeTopicName != null ? subscribeTopicName.trim() : null;
+
+ if (subscribeTopicName != null && !subscribeTopicName.isEmpty()) {
+ Topic[] topics = {new Topic(subscribeTopicName, configuration.getQoS())};
+ connection.subscribe(topics, new Callback<byte[]>() {
+ public void onSuccess(byte[] value) {
+ promise.onSuccess(value);
+ }
+
+ public void onFailure(Throwable value) {
+ promise.onFailure(value);
+ connection.disconnect(null);
+ }
+ });
+ } else {
+ promise.onSuccess(value);
+ }
+
+ }
+
+ public void onFailure(Throwable value) {
+ promise.onFailure(value);
+ connection.disconnect(null);
+ }
+ });
+ promise.await(configuration.getConnectWaitInSeconds(), TimeUnit.SECONDS);
+ }
+
+ protected void doStop() throws Exception {
+ if (connection != null) {
+ final Promise promise = new Promise();
+ connection.disconnect(new Callback<Void>() {
+ public void onSuccess(Void value) {
+ promise.onSuccess(value);
+ }
+
+ public void onFailure(Throwable value) {
+ promise.onFailure(value);
+ }
+ });
+ promise.await(configuration.getDisconnectWaitInSeconds(), TimeUnit.SECONDS);
+ }
+ super.doStop();
+ }
+
+ void publish(String topic, byte[] payload, QoS qoS, boolean retain) throws Exception {
+ final Promise promise = new Promise();
+ connection.publish(topic, payload, qoS, retain, null);
+ /*
+ connection.publish(topic, payload, qoS, retain, new Callback<Void>() {
+ public void onSuccess(Void value) {
+ promise.onSuccess(value);
+ }
+
+ public void onFailure(Throwable value) {
+ promise.onFailure(value);
+ }
+
+ });
+ promise.await(configuration.getSendWaitInSeconds(), TimeUnit.SECONDS);
+ */
+ }
+
+
+ void addConsumer(MQTTConsumer consumer) {
+ consumers.add(consumer);
+ }
+
+ void removeConsumer(MQTTConsumer consumer) {
+ consumers.remove(consumer);
+ }
+
+ public boolean isSingleton() {
+ return false;
+ }
+}
Propchange: camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java?rev=1348030&view=auto
==============================================================================
--- camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java (added)
+++ camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java Fri Jun 8 11:41:34 2012
@@ -0,0 +1,74 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mqtt;
+
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.impl.DefaultAsyncProducer;
+import org.fusesource.mqtt.client.QoS;
+
+public class MQTTProducer extends DefaultAsyncProducer implements Processor {
+
+ private final MQTTEndpoint mqttEndpoint;
+
+ public MQTTProducer(MQTTEndpoint mqttEndpoint) {
+ super(mqttEndpoint);
+ this.mqttEndpoint = mqttEndpoint;
+
+ }
+
+
+
+ @Override
+ public boolean process(Exchange exchange, AsyncCallback asyncCallback) {
+ try {
+ doProcess(exchange);
+ } catch (Exception e) {
+ exchange.setException(e);
+ }
+ asyncCallback.done(true);
+ return true;
+ }
+
+ void doProcess(Exchange exchange) throws Exception {
+
+ byte[] body = exchange.getIn().getBody(byte[].class);
+ if (body != null) {
+ MQTTConfiguration configuration = mqttEndpoint.getConfiguration();
+ boolean retain = configuration.isByDefaultRetain();
+
+ if (exchange.getProperty(configuration.getMqttRetainPropertyName()) != null) {
+ retain = exchange.getProperty(configuration.getMqttRetainPropertyName(), Boolean.class);
+ }
+ QoS qoS = configuration.getQoS();
+ Object qoSValue = exchange.getProperty(configuration.getMqttQosPropertyName());
+ if (qoSValue != null) {
+ qoS = MQTTConfiguration.getQoS(qoSValue.toString());
+ }
+
+ String topicName = configuration.getPublishTopicName();
+ Object topicValue = exchange.getProperty(configuration.getMqttTopicPropertyName());
+ if (topicValue != null) {
+ topicName = topicValue.toString();
+ }
+ mqttEndpoint.publish(topicName, body, qoS, retain);
+
+ }
+
+ }
+}
Propchange: camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/package.html
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/package.html?rev=1348030&view=auto
==============================================================================
--- camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/package.html (added)
+++ camel/trunk/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/package.html Fri Jun 8 11:41:34 2012
@@ -0,0 +1,25 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+<head>
+</head>
+<body>
+
+Defines the <a href="http://activemq.apache.org/camel/mqtt.html">MQTT Component</a>
+
+</body>
+</html>
Added: camel/trunk/components/camel-mqtt/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/main/resources/META-INF/LICENSE.txt?rev=1348030&view=auto
==============================================================================
--- camel/trunk/components/camel-mqtt/src/main/resources/META-INF/LICENSE.txt (added)
+++ camel/trunk/components/camel-mqtt/src/main/resources/META-INF/LICENSE.txt Fri Jun 8 11:41:34 2012
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
Propchange: camel/trunk/components/camel-mqtt/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: camel/trunk/components/camel-mqtt/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/main/resources/META-INF/NOTICE.txt?rev=1348030&view=auto
==============================================================================
--- camel/trunk/components/camel-mqtt/src/main/resources/META-INF/NOTICE.txt (added)
+++ camel/trunk/components/camel-mqtt/src/main/resources/META-INF/NOTICE.txt Fri Jun 8 11:41:34 2012
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
Propchange: camel/trunk/components/camel-mqtt/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: camel/trunk/components/camel-mqtt/src/main/resources/META-INF/services/org/apache/camel/component/mqtt
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/main/resources/META-INF/services/org/apache/camel/component/mqtt?rev=1348030&view=auto
==============================================================================
--- camel/trunk/components/camel-mqtt/src/main/resources/META-INF/services/org/apache/camel/component/mqtt (added)
+++ camel/trunk/components/camel-mqtt/src/main/resources/META-INF/services/org/apache/camel/component/mqtt Fri Jun 8 11:41:34 2012
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class=org.apache.camel.component.mqtt.MQTTComponent
Added: camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTBaseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTBaseTest.java?rev=1348030&view=auto
==============================================================================
--- camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTBaseTest.java (added)
+++ camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTBaseTest.java Fri Jun 8 11:41:34 2012
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mqtt;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * test sending recieving from an MQTT broker
+ */
+public abstract class MQTTBaseTest extends CamelTestSupport {
+ protected static final transient Logger LOG = LoggerFactory.getLogger(MQTTBaseTest.class);
+ protected static String TEST_TOPIC = "ComponentTestTopic";
+ protected BrokerService brokerService;
+ protected int numberOfMessages = 100;
+
+
+ public void setUp() throws Exception {
+ brokerService = new BrokerService();
+ brokerService.setPersistent(false);
+ brokerService.setAdvisorySupport(false);
+ brokerService.addConnector("mqtt://localhost:1883");
+ brokerService.start();
+ super.setUp();
+ }
+
+
+ public void tearDown() throws Exception {
+ super.tearDown();
+ if (brokerService != null) {
+ brokerService.stop();
+ }
+ }
+}
Propchange: camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTBaseTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConfigurationTest.java?rev=1348030&view=auto
==============================================================================
--- camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConfigurationTest.java (added)
+++ camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConfigurationTest.java Fri Jun 8 11:41:34 2012
@@ -0,0 +1,38 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mqtt;
+
+import org.apache.camel.Endpoint;
+import org.fusesource.mqtt.client.QoS;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class MQTTConfigurationTest extends MQTTBaseTest {
+
+
+ @Test
+ public void testBasicConfiguration() throws Exception {
+ Endpoint endpoint = context.getEndpoint("mqtt:todo?byDefaultRetain=true&qualityOfService=exactlyOnce&publishTopicName=" + TEST_TOPIC + "&subscribeTopicName=" + TEST_TOPIC);
+ assertTrue("Endpoint not a MQTTEndpoint: " + endpoint, endpoint instanceof MQTTEndpoint);
+ MQTTEndpoint mqttEndpoint = (MQTTEndpoint) endpoint;
+
+ Assert.assertEquals(mqttEndpoint.getConfiguration().getQoS(), QoS.EXACTLY_ONCE);
+ Assert.assertEquals(mqttEndpoint.getConfiguration().getPublishTopicName(), TEST_TOPIC);
+ Assert.assertEquals(mqttEndpoint.getConfiguration().getSubscribeTopicName(), TEST_TOPIC);
+ Assert.assertTrue(mqttEndpoint.getConfiguration().isByDefaultRetain());
+ }
+}
Propchange: camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConfigurationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConsumerTest.java?rev=1348030&view=auto
==============================================================================
--- camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConsumerTest.java (added)
+++ camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConsumerTest.java Fri Jun 8 11:41:34 2012
@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mqtt;
+
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.fusesource.mqtt.client.BlockingConnection;
+import org.fusesource.mqtt.client.MQTT;
+import org.fusesource.mqtt.client.QoS;
+import org.fusesource.mqtt.client.Topic;
+import org.junit.Test;
+
+public class MQTTConsumerTest extends MQTTBaseTest {
+
+
+ @Test
+ public void testConsume() throws Exception {
+
+ MQTT mqtt = new MQTT();
+ BlockingConnection publisherConnection = mqtt.blockingConnection();
+ Topic topic = new Topic(TEST_TOPIC, QoS.AT_MOST_ONCE);
+ Topic[] topics = {topic};
+
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMinimumMessageCount(numberOfMessages);
+
+ publisherConnection.connect();
+ for (int i = 0; i < numberOfMessages; i++) {
+ String payload = "Message " + i;
+ publisherConnection.publish(topic.name().toString(), payload.getBytes(), QoS.AT_LEAST_ONCE, false);
+ }
+
+ mock.await(5, TimeUnit.SECONDS);
+ mock.assertIsSatisfied();
+ }
+
+
+ protected RouteBuilder createRouteBuilder() {
+
+ return new RouteBuilder() {
+ public void configure() {
+ from("mqtt:bar?subscribeTopicName=" + TEST_TOPIC).transform(body().convertToString()).to("mock:result");
+ }
+ };
+ }
+}
Propchange: camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConsumerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTProducerTest.java?rev=1348030&view=auto
==============================================================================
--- camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTProducerTest.java (added)
+++ camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTProducerTest.java Fri Jun 8 11:41:34 2012
@@ -0,0 +1,81 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mqtt;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Producer;
+import org.apache.camel.builder.RouteBuilder;
+import org.fusesource.mqtt.client.BlockingConnection;
+import org.fusesource.mqtt.client.MQTT;
+import org.fusesource.mqtt.client.Message;
+import org.fusesource.mqtt.client.QoS;
+import org.fusesource.mqtt.client.Topic;
+import org.junit.Test;
+
+public class MQTTProducerTest extends MQTTBaseTest {
+
+ @Test
+ public void testProduce() throws Exception {
+
+ MQTT mqtt = new MQTT();
+ final BlockingConnection subscribeConnection = mqtt.blockingConnection();
+ subscribeConnection.connect();
+ Topic topic = new Topic(TEST_TOPIC, QoS.AT_MOST_ONCE);
+ Topic[] topics = {topic};
+ subscribeConnection.subscribe(topics);
+ final CountDownLatch latch = new CountDownLatch(numberOfMessages);
+
+ Thread thread = new Thread(new Runnable() {
+ public void run() {
+ for (int i = 0; i < numberOfMessages; i++) {
+ try {
+ Message message = subscribeConnection.receive();
+ message.ack();
+ latch.countDown();
+ } catch (Exception e) {
+ e.printStackTrace();
+ break;
+ }
+
+ }
+ }
+ });
+ thread.start();
+
+ Producer producer = context.getEndpoint("direct:foo").createProducer();
+ for (int i = 0; i < numberOfMessages; i++){
+ Exchange exchange = producer.createExchange();
+ exchange.getIn().setBody("test message " + i);
+ producer.process(exchange);
+ }
+ latch.await(20, TimeUnit.SECONDS);
+ assertTrue("Messages not consumed = " + latch.getCount(),latch.getCount()==0);
+ }
+
+
+ protected RouteBuilder createRouteBuilder() {
+
+ return new RouteBuilder() {
+ public void configure() {
+ from("direct:foo").to("mqtt:boo?publishTopicName=" + TEST_TOPIC);
+ }
+ };
+ }
+}
Propchange: camel/trunk/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTProducerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: camel/trunk/components/camel-mqtt/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/test/resources/log4j.properties?rev=1348030&view=auto
==============================================================================
--- camel/trunk/components/camel-mqtt/src/test/resources/log4j.properties (added)
+++ camel/trunk/components/camel-mqtt/src/test/resources/log4j.properties Fri Jun 8 11:41:34 2012
@@ -0,0 +1,37 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+#
+# The logging properties used during tests..
+#
+log4j.rootLogger=info, file
+
+#log4j.logger.twitter4j=DEBUG
+#log4j.logger.org.apache.camel.component.mqttBUG
+#log4j.logger.org.apache.camel=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.file.file=target/camel-twitter-test.log
+log4j.appender.file.append=true
Added: camel/trunk/components/camel-mqtt/src/test/resources/test-options.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/src/test/resources/test-options.properties?rev=1348030&view=auto
==============================================================================
--- camel/trunk/components/camel-mqtt/src/test/resources/test-options.properties (added)
+++ camel/trunk/components/camel-mqtt/src/test/resources/test-options.properties Fri Jun 8 11:41:34 2012
@@ -0,0 +1,22 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+#This uses the Twitter 'cameltweet' account for testing purposes.
+consumer.key=NMqaca1bzXsOcZhP2XlwA
+consumer.secret=VxNQiRLwwKVD0K9mmfxlTTbVdgRpriORypnUbHhxeQw
+access.token=26693234-W0YjxL9cMJrC0VZZ4xdgFMymxIQ10LeL1K8YlbBY
+access.token.secret=BZD51BgzbOdFstWZYsqB5p5dbuuDV12vrOdatzhY4E
\ No newline at end of file
Modified: camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1348030&r1=1348029&r2=1348030&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Fri Jun 8 11:41:34 2012
@@ -114,6 +114,7 @@
<module>camel-mina</module>
<module>camel-mina2</module>
<module>camel-mongodb</module>
+ <module>camel-mqtt</module>
<module>camel-msv</module>
<module>camel-mvel</module>
<module>camel-mybatis</module>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1348030&r1=1348029&r2=1348030&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Jun 8 11:41:34 2012
@@ -132,6 +132,7 @@
<mina2-version>2.0.4</mina2-version>
<mockito-version>1.9.0</mockito-version>
<mongo-java-driver-version>2.7.3</mongo-java-driver-version>
+ <mqtt-client-version>1.2</mqtt-client-version>
<mvel-version>2.0.18</mvel-version>
<mybatis-version>3.1.1</mybatis-version>
<!-- transitive dependency from avro, to use older netty bundle -->