diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/DefaultMqttPahoClientFactory.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/DefaultMqttPahoClientFactory.java index 1eda5d80f6..2445bb401a 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/DefaultMqttPahoClientFactory.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/DefaultMqttPahoClientFactory.java @@ -27,6 +27,7 @@ import org.eclipse.paho.client.mqttv3.MqttException; /** * Creates a default {@link MqttClient} and a set of options as configured. * @author Gary Russell + * @author Gunnar Hillert * @since 1.0 * */ @@ -78,6 +79,11 @@ public class DefaultMqttPahoClientFactory implements MqttPahoClientFactory { this.userName = userName; } + /** + * Will be used to set the "Last Will and Testament" (LWT) for the connection. + * + * @see MqttConnectOptions + */ public void setWill(Will will) { this.will = will; } diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/AbstractMqttMessageDrivenChannelAdapter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/AbstractMqttMessageDrivenChannelAdapter.java index 0806980e88..5e21c72c7e 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/AbstractMqttMessageDrivenChannelAdapter.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/AbstractMqttMessageDrivenChannelAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/xml/spring-integration-mqttadapter.gif b/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/xml/spring-integration-mqttadapter.gif index 41b369fece..210e0764fa 100644 Binary files a/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/xml/spring-integration-mqttadapter.gif and b/spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/xml/spring-integration-mqttadapter.gif differ diff --git a/spring-integration-mqtt/src/reference/docbook/SIAdapterLowerPrefix.xml b/spring-integration-mqtt/src/reference/docbook/SIAdapterLowerPrefix.xml deleted file mode 100644 index 151e09dbed..0000000000 --- a/spring-integration-mqtt/src/reference/docbook/SIAdapterLowerPrefix.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - MqttAdapter Adapter - - The Spring Integration MqttAdapter Adapter provides... - - - - Outbound Channel adapter - - - Outbound Gateway - - - Inbound Channel Adapter - - - -
- Java Implementation - Each of the provided components will use the - org.springframework.integration.mqtt.core.MqttAdapterExecutor - class... - -
-
- Common Configuration Attributes - - Certain configuration parameters are shared amongst all MqttAdapter - components and are described below: - - - auto-startup - - Lifecycle attribute signaling if this component should - be started during Application Context startup. - Defaults to true. - Optional. - - - id - - Identifies the underlying Spring bean definition, which - is an instance of either EventDrivenConsumer - or PollingConsumer. - Optional. - - -
- -
- Outbound Channel Adapter - - The MqttAdapter Outbound channel adapter allows you to... - -
-
- Outbound Gateway - - Outbound gateways are similar to outbound channel adapters except that it can also be used to - get a result on the reply channel after performing - the given... - -
-
- Inbound Channel Adapter - - An inbound channel adapter is used to execute... - -
- - diff --git a/spring-integration-mqtt/src/reference/docbook/history.xml b/spring-integration-mqtt/src/reference/docbook/history.xml deleted file mode 100644 index 549be2153b..0000000000 --- a/spring-integration-mqtt/src/reference/docbook/history.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - Change History - - - diff --git a/spring-integration-mqtt/src/reference/docbook/images/logo.png b/spring-integration-mqtt/src/reference/docbook/images/logo.png deleted file mode 100644 index 8c71c13a0e..0000000000 Binary files a/spring-integration-mqtt/src/reference/docbook/images/logo.png and /dev/null differ diff --git a/spring-integration-mqtt/src/reference/docbook/index.xml b/spring-integration-mqtt/src/reference/docbook/index.xml deleted file mode 100644 index d3fd4e8cf4..0000000000 --- a/spring-integration-mqtt/src/reference/docbook/index.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - Spring Integration MqttAdapter Adapter - MqttAdapter Adapter ${version} - Spring Integration - ${version} - - - - - - - - - - - - - - Gary Russell - - - © SpringSource Inc., 2012 - - - - - - - What's new? - - - For those who are already familiar with Spring Integration, this - chapter - provides a brief overview of the new features of version 2.2. If you are - interested in the changes and features, that were introduced in - earlier - versions, please take a look at chapter: - - - - - - - - - - Integration Adapters - - This section covers the various Channel Adapters and Messaging - Gateways provided - by Spring Integration to support Message-based communication with - external systems. - - - - - - Appendices - - Advanced Topics and Additional Resources - - - - diff --git a/spring-integration-mqtt/src/reference/docbook/resources.xml b/spring-integration-mqtt/src/reference/docbook/resources.xml deleted file mode 100644 index 109faa9b53..0000000000 --- a/spring-integration-mqtt/src/reference/docbook/resources.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - Additional Resources - -
- Spring Integration Home - - The definitive source of information about Spring Integration is the - Spring Integration Home at - http://www.springsource.org. That site serves as a hub of - information and is the best place to find up-to-date announcements about the project as well as links to - articles, blogs, and new sample applications. - -
- - diff --git a/spring-integration-mqtt/src/reference/docbook/whats-new.xml b/spring-integration-mqtt/src/reference/docbook/whats-new.xml deleted file mode 100644 index f037937961..0000000000 --- a/spring-integration-mqtt/src/reference/docbook/whats-new.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - What's new? - - This chapter provides an overview of the new features and improvements - that have been added to the MqttAdapter Adapter: - - - diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BackTobackAdapterTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BackTobackAdapterTests.java index 60e44f3673..66e2ba3c21 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BackTobackAdapterTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BackTobackAdapterTests.java @@ -31,7 +31,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; /** * @author Gary Russell - * @since 3.0 + * @since 1.0 * */ public class BackTobackAdapterTests { diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BrokerRunning.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BrokerRunning.java index f7c57268a0..57587d84da 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BrokerRunning.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BrokerRunning.java @@ -32,7 +32,7 @@ import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory; /** * @author Gary Russell - * @since 3.0 + * @since 1.0 * */ public class BrokerRunning extends TestWatcher { diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java index bdce33fe61..92c44c4b60 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java @@ -53,7 +53,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; /** * @author Gary Russell - * @since 3.0 + * @since 1.0 * */ public class MqttAdapterTests { diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParserTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParserTests.java index ec895639d8..5b3452f653 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParserTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParserTests.java @@ -32,7 +32,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * @author Gary Russell - * @since 3.0 + * @since 1.0 * */ @ContextConfiguration diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests.java index be2552f465..71a752b8d2 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests.java @@ -35,7 +35,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * @author Gary Russell - * @since 3.0 + * @since 1.0 * */ @ContextConfiguration