You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2017/06/14 10:02:22 UTC
[2/2] camel git commit: CAMEL-11409: Add writeTimeout configuration
pro...
CAMEL-11409: Add writeTimeout configuration pro...
...perty and use with the WriteFuture in Mina2Helper
Regenerate Spring Boot configuration and component documentation.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/79514589
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/79514589
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/79514589
Branch: refs/heads/master
Commit: 795145892ec4b7609068139b041b3542b36df69c
Parents: 3b3cbe8
Author: Zoran Regvart <zr...@apache.org>
Authored: Wed Jun 14 12:01:57 2017 +0200
Committer: Zoran Regvart <zr...@apache.org>
Committed: Wed Jun 14 12:01:57 2017 +0200
----------------------------------------------------------------------
components/camel-mina2/src/main/docs/mina2-component.adoc | 3 ++-
.../component/mina2/springboot/Mina2ComponentConfiguration.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/79514589/components/camel-mina2/src/main/docs/mina2-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-mina2/src/main/docs/mina2-component.adoc b/components/camel-mina2/src/main/docs/mina2-component.adoc
index 90741c3..784c191 100644
--- a/components/camel-mina2/src/main/docs/mina2-component.adoc
+++ b/components/camel-mina2/src/main/docs/mina2-component.adoc
@@ -100,7 +100,7 @@ with the following path and query parameters:
| **port** | *Required* Port number | | int
|=======================================================================
-#### Query Parameters (26 parameters):
+#### Query Parameters (27 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|=======================================================================
@@ -109,6 +109,7 @@ with the following path and query parameters:
| **minaLogger** (common) | You can enable the Apache MINA logging filter. Apache MINA uses slf4j logging at INFO level to log all input and output. | false | boolean
| **sync** (common) | Setting to set endpoint as one-way or request-response. | true | boolean
| **timeout** (common) | You can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds so 60000 is 60 seconds. | 30000 | long
+| **writeTimeout** (common) | Maximum amount of time it should take to send data to the MINA session. Default is 10000 milliseconds. | 10000 | long
| **bridgeErrorHandler** (consumer) | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN or ERROR level and ignored. | false | boolean
| **clientMode** (consumer) | If the clientMode is true mina consumer will connect the address as a TCP client. | false | boolean
| **disconnectOnNoReply** (consumer) | If sync is enabled then this option dictates MinaConsumer if it should disconnect where there is no reply to send back. | true | boolean
http://git-wip-us.apache.org/repos/asf/camel/blob/79514589/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java
index 97cc051..0059b4a 100644
--- a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java
@@ -430,4 +430,4 @@ public class Mina2ComponentConfiguration
this.clientMode = clientMode;
}
}
-}
+}
\ No newline at end of file