camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/2] camel git commit: Component docs
Date Tue, 22 Nov 2016 08:47:34 GMT
Repository: camel
Updated Branches:
  refs/heads/master 8ab374b1e -> f30365ece


Component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f30365ec
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f30365ec
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f30365ec

Branch: refs/heads/master
Commit: f30365ece5f5c15d2208a4de3516273730bc949e
Parents: 23c7dc4
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Tue Nov 22 09:47:19 2016 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue Nov 22 09:47:26 2016 +0100

----------------------------------------------------------------------
 .../websocket/springboot/WebsocketComponentConfiguration.java   | 4 ++--
 .../src/main/docs/atmosphere-websocket-component.adoc           | 5 +++--
 .../camel-spring-ldap/src/main/docs/spring-ldap-component.adoc  | 2 +-
 .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml       | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/f30365ec/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
index 190bb22..c930430 100644
--- a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
+++ b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
@@ -42,8 +42,8 @@ public class WebsocketComponentConfiguration {
     private HttpRegistry httpRegistry;
     /**
      * Whether to automatic bind multipart/form-data as attachments on the Camel
-     * Exchange. This is turn off by default as this may require servet specific
-     * configuration to enable this when using Servlet's.
+     * Exchange. This is turn off by default as this may require servlet
+     * specific configuration to enable this when using Servlet's.
      */
     private Boolean attachmentMultipartBinding;
     /**

http://git-wip-us.apache.org/repos/asf/camel/blob/f30365ec/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
index 46b80f4..860d653 100644
--- a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
+++ b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
@@ -48,7 +48,7 @@ The Atmosphere Websocket component supports 7 options which are listed below.
 | Name | Java Type | Description
 | servletName | String | Default name of servlet to use. The default name is CamelServlet.
 | httpRegistry | HttpRegistry | To use a custom org.apache.camel.component.servlet.HttpRegistry.
-| attachmentMultipartBinding | boolean | Whether to automatic bind multipart/form-data as
attachments on the Camel Exchange. This is turn off by default as this may require servet
specific configuration to enable this when using Servlet's.
+| attachmentMultipartBinding | boolean | Whether to automatic bind multipart/form-data as
attachments on the Camel Exchange. This is turn off by default as this may require servlet
specific configuration to enable this when using Servlet's.
 | httpBinding | HttpBinding | To use a custom HttpBinding to control the mapping between
Camel message and HttpClient.
 | httpConfiguration | HttpConfiguration | To use the shared HttpConfiguration as base configuration.
 | allowJavaSerializedObject | boolean | Whether to allow java serialization when a request
uses context-type=application/x-java-serialized-object This is by default turned off. If you
enable this then be aware that Java will deserialize the incoming data from the request to
Java and that can be a potential security risk.
@@ -61,7 +61,7 @@ The Atmosphere Websocket component supports 7 options which are listed below.
 
 
 // endpoint options: START
-The Atmosphere Websocket component supports 35 endpoint options which are listed below:
+The Atmosphere Websocket component supports 36 endpoint options which are listed below:
 
 {% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
@@ -84,6 +84,7 @@ The Atmosphere Websocket component supports 35 endpoint options which are
listed
 | responseBufferSize | consumer |  | Integer | To use a custom buffer size on the javax.servlet.ServletResponse.
 | servletName | consumer | CamelServlet | String | Name of the servlet to use
 | traceEnabled | consumer | false | boolean | Specifies whether to enable HTTP TRACE for
this Servlet consumer. By default TRACE is turned off.
+| attachmentMultipartBinding | consumer (advanced) | false | boolean | Whether to automatic
bind multipart/form-data as attachments on the Camel Exchange. This is turn off by default
as this may require servlet specific configuration to enable this when using Servlet's.
 | exceptionHandler | consumer (advanced) |  | ExceptionHandler | To let the consumer use
a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options
is not in use. By default the consumer will deal with exceptions that will be logged at WARN/ERROR
level and ignored.
 | exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the exchange pattern
when the consumer creates an exchange.
 | authMethodPriority | producer |  | String | Authentication method for proxy either as Basic
Digest or NTLM.

http://git-wip-us.apache.org/repos/asf/camel/blob/f30365ec/components/camel-spring-ldap/src/main/docs/spring-ldap-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-spring-ldap/src/main/docs/spring-ldap-component.adoc b/components/camel-spring-ldap/src/main/docs/spring-ldap-component.adoc
index d7a18a2..8c7c200 100644
--- a/components/camel-spring-ldap/src/main/docs/spring-ldap-component.adoc
+++ b/components/camel-spring-ldap/src/main/docs/spring-ldap-component.adoc
@@ -46,7 +46,7 @@ The Spring LDAP component has no options.
 
 
 // endpoint options: START
-The Spring LDAP component supports 7 endpoint options which are listed below:
+The Spring LDAP component supports 4 endpoint options which are listed below:
 
 {% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]

http://git-wip-us.apache.org/repos/asf/camel/blob/f30365ec/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index d8e840c..b0255af 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -2872,12 +2872,12 @@
       <dependency>
         <groupId>org.jruby</groupId>
         <artifactId>jruby</artifactId>
-        <version>1.7.26</version>
+        <version>1.7.18</version>
       </dependency>
       <dependency>
         <groupId>org.jruby</groupId>
         <artifactId>jruby-complete</artifactId>
-        <version>1.7.26</version>
+        <version>1.7.18</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>


Mime
View raw message