Repository: camel
Updated Branches:
  refs/heads/master 8a7e8fc7f -> 7c3beb5dc


Added documentation (and some minor corrections)


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

Branch: refs/heads/master
Commit: 7c3beb5dc1a78ad4be86650a40211b1ceb51ddc2
Parents: 37c4c0d
Author: Arno Noordover <anoordo...@users.noreply.github.com>
Authored: Sat May 28 15:41:38 2016 +0200
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Sat May 28 15:55:54 2016 +0200

----------------------------------------------------------------------
 components/camel-cxf/src/main/docs/cxf.adoc | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/7c3beb5d/components/camel-cxf/src/main/docs/cxf.adoc
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/docs/cxf.adoc 
b/components/camel-cxf/src/main/docs/cxf.adoc
index fdd17a1..925ada1 100644
--- a/components/camel-cxf/src/main/docs/cxf.adoc
+++ b/components/camel-cxf/src/main/docs/cxf.adoc
@@ -263,10 +263,16 @@ cases.
 PhaseInterceptorChain skips logging the Fault that it catches.
 
 |`cxfEndpointConfigurer` |No |New in *Camel 2.11*. This option could apply the 
implementation of
-`org.apache.camel.component.cxf.CxfEndpointConfigurer which `supports to
+`org.apache.camel.component.cxf.CxfEndpointConfigurer` which supports to
 configure the CXF endpoint in  programmatic way. Since *Camel
-2.15.0,*user can configure the CXF server and client by implementing
-configure\{Server|Client} method of `CxfEndpointConfigurer`.
+2.15.0*,user can configure the CXF server and client by implementing
+configure\{Server/Client} method of `CxfEndpointConfigurer`.
+
+|`sslContextParameters` |No |New in *Camel 2.18.0*. This option can be use to 
reference a
+Camel SSL-context. You can reference the SSL-context by using the # convention.
+
+|`hostnameVerifier` |No |New in *Camel 2.18.0*. This option can be used to 
reference a
+HostnameVerifier from the registry using the # convention.
 
 |`username` |No |New in *Camel 2.12.3* This option is used to set the basic
 authentication information of username for the CXF client.
@@ -274,7 +280,7 @@ authentication information of username for the CXF client.
 |`password` |No |New in *Camel 2.12.3* This option is used to set the basic
 authentication information of password for the CXF client.
 
-|`continuationTimeout` |No |New in *Camel 2.14.0*This option is used to set 
the CXF continuation
+|`continuationTimeout` |No |New in *Camel 2.14.0*. This option is used to set 
the CXF continuation
 timeout which could be used in CxfConsumer by default when the CXF
 server is using Jetty or Servlet transport. (Before *Camel 2.14.0*,
 CxfConsumer just set the continuation timeout to be 0, which means the

Reply via email to