camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [39/51] [partial] camel git commit: CAMEL-9541: Use -component as suffix for component docs.
Date Tue, 16 Aug 2016 08:04:03 GMT
http://git-wip-us.apache.org/repos/asf/camel/blob/9c0b7baf/components/camel-atmos/src/main/docs/atmos.adoc
----------------------------------------------------------------------
diff --git a/components/camel-atmos/src/main/docs/atmos.adoc b/components/camel-atmos/src/main/docs/atmos.adoc
deleted file mode 100644
index 1618dba..0000000
--- a/components/camel-atmos/src/main/docs/atmos.adoc
+++ /dev/null
@@ -1,72 +0,0 @@
-[[Atmos-Atmos]]
-Atmos Component
-~~~~~~~~~~~~~~~
-
-*Available as of Camel 2.15*
-
-*Camel-Gora* is an http://camel.apache.org/[Apache Camel] component that
-allows you to work with ViPR object data services using the
-https://github.com/emcvipr/dataservices-sdk-java[Atmos Client].
-
-[source,java]
--------------------------------
-from("atmos:foo/get?remotePath=/path").to("mock:test");
--------------------------------
-
-[[Atmos-Options]]
-Options
-~~~~~~~
-
-
-// component options: START
-The Atmos component has no options.
-// component options: END
-
-
-
-// endpoint options: START
-The Atmos component supports 14 endpoint options which are listed below:
-
-{% raw %}
-[width="100%",cols="2s,1,1m,1m,5",options="header"]
-|=======================================================================
-| Name | Group | Default | Java Type | Description
-| name | common |  | String | Atmos name
-| operation | common |  | AtmosOperation | *Required* Operation to perform
-| enableSslValidation | common | false | boolean | Atmos SSL validation
-| fullTokenId | common |  | String | Atmos client fullTokenId
-| localPath | common |  | String | Local path to put files
-| newRemotePath | common |  | String | New path on Atmos when moving files
-| query | common |  | String | Search query on Atmos
-| remotePath | common |  | String | Where to put files on Atmos
-| secretKey | common |  | String | Atmos shared secret
-| uri | common |  | String | Atomos server uri
-| bridgeErrorHandler | consumer | false | boolean | 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/ERROR level and ignored.
-| 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 | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange
-| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
-|=======================================================================
-{% endraw %}
-// endpoint options: END
-
-
-[[Atmos-Dependencies]]
-Dependencies
-^^^^^^^^^^^^
-
-To use Atmos in your camel routes you need to add the dependency
-on *camel-atmos* which implements this data format.
-
-If you use maven you could just add the following to your pom.xml,
-substituting the version number for the latest & greatest release (see
-link:download.html[the download page for the latest versions]).
-
-[source,xml]
-----------------------------------------------------------
-<dependency>
-  <groupId>org.apache.camel</groupId>
-  <artifactId>camel-atmos</artifactId>
-  <version>x.x.x</version>
-  <!-- use the same version as your Camel core version -->
-</dependency>
-----------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/camel/blob/9c0b7baf/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
new file mode 100644
index 0000000..d4fdbac
--- /dev/null
+++ b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
@@ -0,0 +1,185 @@
+[[Atmosphere-Websocket-AtmosphereWebsocketServletComponent]]
+Atmosphere Websocket Servlet Component
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+*Available as of Camel 2.14*
+
+The *atmosphere-websocket:* component provides Websocket
+based link:endpoint.html[endpoints] for a servlet communicating with
+external clients over Websocket (as a servlet accepting websocket
+connections from external clients). +
+The component uses the link:servlet.html[SERVLET] component and uses
+the https://github.com/Atmosphere/atmosphere[Atmosphere] library to
+support the Websocket transport in various Servlet containers (e..g.,
+Jetty, Tomcat, ...).
+
+Unlike the
+https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=39621544[Websocket]
+component that starts the embedded Jetty server, this component uses the
+servlet provider of the container.
+
+Maven users will need to add the following dependency to
+their `pom.xml` for this component:
+
+[source,xml]
+------------------------------------------------------------
+<dependency>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>camel-atmosphere-websocket</artifactId>
+    <version>x.x.x</version>
+    <!-- use the same version as your Camel core version -->
+</dependency>
+------------------------------------------------------------
+
+[[Atmosphere-Websocket-Options]]
+Atmosphere-Websocket Options
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+// component options: START
+The Atmosphere Websocket component supports 7 options which are listed below.
+
+
+
+{% raw %}
+[width="100%",cols="2s,1m,8",options="header"]
+|=======================================================================
+| 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.
+| 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.
+| headerFilterStrategy | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message.
+|=======================================================================
+{% endraw %}
+// component options: END
+
+
+
+// endpoint options: START
+The Atmosphere Websocket component supports 34 endpoint options which are listed below:
+
+{% raw %}
+[width="100%",cols="2s,1,1m,1m,5",options="header"]
+|=======================================================================
+| Name | Group | Default | Java Type | Description
+| servicePath | common |  | String | *Required* Name of websocket endpoint
+| chunked | common | true | boolean | If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response
+| disableStreamCache | common | false | boolean | Determines whether or not the raw input stream from Servlet is cached or not (Camel will read the stream into a in memory/overflow to file Stream caching) cache. By default Camel will cache the Servlet input stream to support reading it multiple times to ensure it Camel can retrieve all data from the stream. However you can set this option to true when you for example need to access the raw stream such as streaming it directly to a file or other persistent store. DefaultHttpBinding will copy the request input stream into a stream cache and put it into message body if this option is false to support reading the stream multiple times. If you use Servlet to bridge/proxy an endpoint then consider enabling this option to improve performance in case you do not need to read the message payload multiple times. The http/http4 producer will by default cache the response body stream. If setting this option to true then the producers will not ca
 che the response body stream but use the response stream as-is as the message body.
+| headerFilterStrategy | common |  | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message.
+| httpBinding | common |  | HttpBinding | To use a custom HttpBinding to control the mapping between Camel message and HttpClient.
+| sendToAll | common | false | boolean | Whether to send to all (broadcast) or send to a single receiver.
+| transferException | common | false | boolean | If enabled and an Exchange failed processing on the consumer side and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type. On the producer side the exception will be deserialized and thrown as is instead of the HttpOperationFailedException. The caused exception is required to be serialized. 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.
+| useStreaming | common | false | boolean | To enable streaming to send data as multiple text fragments.
+| async | consumer | false | boolean | Configure the consumer to work in async mode
+| bridgeErrorHandler | consumer | false | boolean | 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/ERROR level and ignored.
+| eagerCheckContentAvailable | consumer | false | boolean | Whether to eager check whether the HTTP requests has content if the content-length header is 0 or not present. This can be turned on in case HTTP clients do not send streamed data.
+| httpMethodRestrict | consumer |  | String | Used to only allow consuming if the HttpMethod matches such as GET/POST/PUT etc. Multiple methods can be specified separated by comma.
+| matchOnUriPrefix | consumer | false | boolean | Whether or not the consumer should try to find a target consumer by matching the URI prefix if no exact match is found.
+| optionsEnabled | consumer | false | boolean | Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.
+| 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.
+| 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.
+| authMethodPriority | producer |  | String | Authentication method for proxy either as Basic Digest or NTLM.
+| bridgeEndpoint | producer | false | boolean | If the option is true HttpProducer will ignore the Exchange.HTTP_URI header and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back.
+| connectionClose | producer | false | boolean | Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false.
+| copyHeaders | producer | true | boolean | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false allows to only include the headers from the HTTP response (not propagating IN headers).
+| ignoreResponseBody | producer | false | boolean | If this option is true The http producer won't read response body and cache the input stream
+| okStatusCodeRange | producer | 200-299 | String | The status codes which is considered a success response. The values are inclusive. The range must be defined as from-to with the dash included.
+| preserveHostHeader | producer | false | boolean | If the option is true HttpProducer will set the Host header to the value contained in the current exchange Host header useful in reverse proxy applications where you want the Host header received by the downstream server to reflect the URL called by the upstream client this allows applications which use the Host header to generate accurate URL's for a proxied service
+| proxyHost | producer |  | String | The proxy host name
+| proxyPort | producer |  | int | The proxy port number
+| throwExceptionOnFailure | producer | true | boolean | Option to disable throwing the HttpOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code.
+| urlRewrite | producer (advanced) |  | UrlRewrite | Refers to a custom org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls when you bridge/proxy endpoints. See more details at http://camel.apache.org/urlrewrite.html
+| exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange
+| mapHttpMessageBody | advanced | true | boolean | If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping.
+| mapHttpMessageFormUrlEncodedBody | advanced | true | boolean | If this option is true then IN exchange Form Encoded body of the exchange will be mapped to HTTP. Setting this to false will avoid the HTTP Form Encoded body mapping.
+| mapHttpMessageHeaders | advanced | true | boolean | If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers. Setting this to false will avoid the HTTP Headers mapping.
+| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
+|=======================================================================
+{% endraw %}
+// endpoint options: END
+
+
+[[Atmosphere-Websocket-URIFormat]]
+URI Format
+^^^^^^^^^^
+
+[source,java]
+-----------------------------------------------
+atmosphere-websocket:///relative path[?options]
+-----------------------------------------------
+
+[[Atmosphere-Websocket-ReadingandWritingDataoverWebsocket]]
+Reading and Writing Data over Websocket
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+An atmopshere-websocket endpoint can either write data to the socket or
+read from the socket, depending on whether the endpoint is configured as
+the producer or the consumer, respectively.
+
+[[Atmosphere-Websocket-ConfiguringURItoReadorWriteData]]
+Configuring URI to Read or Write Data
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In the route below, Camel will read from the specified websocket
+connection.
+
+[source,java]
+-------------------------------------------
+from("atmosphere-websocket:///servicepath")
+        .to("direct:next");
+-------------------------------------------
+
+And the equivalent Spring sample:
+
+[source,xml]
+------------------------------------------------------------
+<camelContext xmlns="http://camel.apache.org/schema/spring">
+  <route>
+    <from uri="atmosphere-websocket:///servicepath"/>
+    <to uri="direct:next"/>
+  </route>
+</camelContext>
+------------------------------------------------------------
+
+In the route below, Camel will read from the specified websocket
+connection.
+
+[source,java]
+---------------------------------------------------
+from("direct:next")
+        .to("atmosphere-websocket:///servicepath");
+---------------------------------------------------
+
+And the equivalent Spring sample:
+
+[source,xml]
+------------------------------------------------------------
+<camelContext xmlns="http://camel.apache.org/schema/spring">
+  <route>
+    <from uri="direct:next"/>
+    <to uri="atmosphere-websocket:///servicepath"/>
+  </route>
+</camelContext>
+------------------------------------------------------------
+
+ 
+
+[[Atmosphere-Websocket-SeeAlso]]
+See Also
+^^^^^^^^
+
+* link:configuring-camel.html[Configuring Camel]
+* link:component.html[Component]
+* link:endpoint.html[Endpoint]
+* link:getting-started.html[Getting Started]
+
+* link:servlet.html[SERVLET]
+* link:ahc-ws.html[AHC-WS]
+*
+https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=39621544[Websocket]
+

http://git-wip-us.apache.org/repos/asf/camel/blob/9c0b7baf/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket.adoc
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket.adoc b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket.adoc
deleted file mode 100644
index d4fdbac..0000000
--- a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket.adoc
+++ /dev/null
@@ -1,185 +0,0 @@
-[[Atmosphere-Websocket-AtmosphereWebsocketServletComponent]]
-Atmosphere Websocket Servlet Component
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-*Available as of Camel 2.14*
-
-The *atmosphere-websocket:* component provides Websocket
-based link:endpoint.html[endpoints] for a servlet communicating with
-external clients over Websocket (as a servlet accepting websocket
-connections from external clients). +
-The component uses the link:servlet.html[SERVLET] component and uses
-the https://github.com/Atmosphere/atmosphere[Atmosphere] library to
-support the Websocket transport in various Servlet containers (e..g.,
-Jetty, Tomcat, ...).
-
-Unlike the
-https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=39621544[Websocket]
-component that starts the embedded Jetty server, this component uses the
-servlet provider of the container.
-
-Maven users will need to add the following dependency to
-their `pom.xml` for this component:
-
-[source,xml]
-------------------------------------------------------------
-<dependency>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>camel-atmosphere-websocket</artifactId>
-    <version>x.x.x</version>
-    <!-- use the same version as your Camel core version -->
-</dependency>
-------------------------------------------------------------
-
-[[Atmosphere-Websocket-Options]]
-Atmosphere-Websocket Options
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-
-// component options: START
-The Atmosphere Websocket component supports 7 options which are listed below.
-
-
-
-{% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
-|=======================================================================
-| 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.
-| 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.
-| headerFilterStrategy | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message.
-|=======================================================================
-{% endraw %}
-// component options: END
-
-
-
-// endpoint options: START
-The Atmosphere Websocket component supports 34 endpoint options which are listed below:
-
-{% raw %}
-[width="100%",cols="2s,1,1m,1m,5",options="header"]
-|=======================================================================
-| Name | Group | Default | Java Type | Description
-| servicePath | common |  | String | *Required* Name of websocket endpoint
-| chunked | common | true | boolean | If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response
-| disableStreamCache | common | false | boolean | Determines whether or not the raw input stream from Servlet is cached or not (Camel will read the stream into a in memory/overflow to file Stream caching) cache. By default Camel will cache the Servlet input stream to support reading it multiple times to ensure it Camel can retrieve all data from the stream. However you can set this option to true when you for example need to access the raw stream such as streaming it directly to a file or other persistent store. DefaultHttpBinding will copy the request input stream into a stream cache and put it into message body if this option is false to support reading the stream multiple times. If you use Servlet to bridge/proxy an endpoint then consider enabling this option to improve performance in case you do not need to read the message payload multiple times. The http/http4 producer will by default cache the response body stream. If setting this option to true then the producers will not ca
 che the response body stream but use the response stream as-is as the message body.
-| headerFilterStrategy | common |  | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message.
-| httpBinding | common |  | HttpBinding | To use a custom HttpBinding to control the mapping between Camel message and HttpClient.
-| sendToAll | common | false | boolean | Whether to send to all (broadcast) or send to a single receiver.
-| transferException | common | false | boolean | If enabled and an Exchange failed processing on the consumer side and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type. On the producer side the exception will be deserialized and thrown as is instead of the HttpOperationFailedException. The caused exception is required to be serialized. 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.
-| useStreaming | common | false | boolean | To enable streaming to send data as multiple text fragments.
-| async | consumer | false | boolean | Configure the consumer to work in async mode
-| bridgeErrorHandler | consumer | false | boolean | 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/ERROR level and ignored.
-| eagerCheckContentAvailable | consumer | false | boolean | Whether to eager check whether the HTTP requests has content if the content-length header is 0 or not present. This can be turned on in case HTTP clients do not send streamed data.
-| httpMethodRestrict | consumer |  | String | Used to only allow consuming if the HttpMethod matches such as GET/POST/PUT etc. Multiple methods can be specified separated by comma.
-| matchOnUriPrefix | consumer | false | boolean | Whether or not the consumer should try to find a target consumer by matching the URI prefix if no exact match is found.
-| optionsEnabled | consumer | false | boolean | Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off.
-| 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.
-| 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.
-| authMethodPriority | producer |  | String | Authentication method for proxy either as Basic Digest or NTLM.
-| bridgeEndpoint | producer | false | boolean | If the option is true HttpProducer will ignore the Exchange.HTTP_URI header and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back.
-| connectionClose | producer | false | boolean | Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false.
-| copyHeaders | producer | true | boolean | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false allows to only include the headers from the HTTP response (not propagating IN headers).
-| ignoreResponseBody | producer | false | boolean | If this option is true The http producer won't read response body and cache the input stream
-| okStatusCodeRange | producer | 200-299 | String | The status codes which is considered a success response. The values are inclusive. The range must be defined as from-to with the dash included.
-| preserveHostHeader | producer | false | boolean | If the option is true HttpProducer will set the Host header to the value contained in the current exchange Host header useful in reverse proxy applications where you want the Host header received by the downstream server to reflect the URL called by the upstream client this allows applications which use the Host header to generate accurate URL's for a proxied service
-| proxyHost | producer |  | String | The proxy host name
-| proxyPort | producer |  | int | The proxy port number
-| throwExceptionOnFailure | producer | true | boolean | Option to disable throwing the HttpOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code.
-| urlRewrite | producer (advanced) |  | UrlRewrite | Refers to a custom org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls when you bridge/proxy endpoints. See more details at http://camel.apache.org/urlrewrite.html
-| exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange
-| mapHttpMessageBody | advanced | true | boolean | If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping.
-| mapHttpMessageFormUrlEncodedBody | advanced | true | boolean | If this option is true then IN exchange Form Encoded body of the exchange will be mapped to HTTP. Setting this to false will avoid the HTTP Form Encoded body mapping.
-| mapHttpMessageHeaders | advanced | true | boolean | If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers. Setting this to false will avoid the HTTP Headers mapping.
-| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
-|=======================================================================
-{% endraw %}
-// endpoint options: END
-
-
-[[Atmosphere-Websocket-URIFormat]]
-URI Format
-^^^^^^^^^^
-
-[source,java]
------------------------------------------------
-atmosphere-websocket:///relative path[?options]
------------------------------------------------
-
-[[Atmosphere-Websocket-ReadingandWritingDataoverWebsocket]]
-Reading and Writing Data over Websocket
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-An atmopshere-websocket endpoint can either write data to the socket or
-read from the socket, depending on whether the endpoint is configured as
-the producer or the consumer, respectively.
-
-[[Atmosphere-Websocket-ConfiguringURItoReadorWriteData]]
-Configuring URI to Read or Write Data
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-In the route below, Camel will read from the specified websocket
-connection.
-
-[source,java]
--------------------------------------------
-from("atmosphere-websocket:///servicepath")
-        .to("direct:next");
--------------------------------------------
-
-And the equivalent Spring sample:
-
-[source,xml]
-------------------------------------------------------------
-<camelContext xmlns="http://camel.apache.org/schema/spring">
-  <route>
-    <from uri="atmosphere-websocket:///servicepath"/>
-    <to uri="direct:next"/>
-  </route>
-</camelContext>
-------------------------------------------------------------
-
-In the route below, Camel will read from the specified websocket
-connection.
-
-[source,java]
----------------------------------------------------
-from("direct:next")
-        .to("atmosphere-websocket:///servicepath");
----------------------------------------------------
-
-And the equivalent Spring sample:
-
-[source,xml]
-------------------------------------------------------------
-<camelContext xmlns="http://camel.apache.org/schema/spring">
-  <route>
-    <from uri="direct:next"/>
-    <to uri="atmosphere-websocket:///servicepath"/>
-  </route>
-</camelContext>
-------------------------------------------------------------
-
- 
-
-[[Atmosphere-Websocket-SeeAlso]]
-See Also
-^^^^^^^^
-
-* link:configuring-camel.html[Configuring Camel]
-* link:component.html[Component]
-* link:endpoint.html[Endpoint]
-* link:getting-started.html[Getting Started]
-
-* link:servlet.html[SERVLET]
-* link:ahc-ws.html[AHC-WS]
-*
-https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=39621544[Websocket]
-

http://git-wip-us.apache.org/repos/asf/camel/blob/9c0b7baf/components/camel-atom/src/main/docs/atom-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-atom/src/main/docs/atom-component.adoc b/components/camel-atom/src/main/docs/atom-component.adoc
new file mode 100644
index 0000000..7b50e21
--- /dev/null
+++ b/components/camel-atom/src/main/docs/atom-component.adoc
@@ -0,0 +1,148 @@
+[[Atom-AtomComponent]]
+Atom Component
+~~~~~~~~~~~~~~
+
+The *atom:* component is used for polling Atom feeds.
+
+Camel will poll the feed every 60 seconds by default. +
+ *Note:* The component currently only supports polling (consuming)
+feeds.
+
+Maven users will need to add the following dependency to their `pom.xml`
+for this component:
+
+[source,xml]
+------------------------------------------------------------
+<dependency>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>camel-atom</artifactId>
+    <version>x.x.x</version>
+    <!-- use the same version as your Camel core version -->
+</dependency>
+------------------------------------------------------------
+
+[[Atom-URIformat]]
+URI format
+^^^^^^^^^^
+
+[source,java]
+------------------------
+atom://atomUri[?options]
+------------------------
+
+Where *atomUri* is the URI to the Atom feed to poll.
+
+[[Atom-Options]]
+Options
+^^^^^^^
+
+
+// component options: START
+The Atom component has no options.
+// component options: END
+
+
+
+// endpoint options: START
+The Atom component supports 28 endpoint options which are listed below:
+
+{% raw %}
+[width="100%",cols="2s,1,1m,1m,5",options="header"]
+|=======================================================================
+| Name | Group | Default | Java Type | Description
+| feedUri | consumer |  | String | *Required* The URI to the feed to poll.
+| bridgeErrorHandler | consumer | false | boolean | 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/ERROR level and ignored.
+| feedHeader | consumer | true | boolean | Sets whether to add the feed object as a header
+| filter | consumer | true | boolean | Sets whether to use filtering or not of the entries.
+| lastUpdate | consumer |  | Date | Sets the timestamp to be used for filtering entries from the atom feeds. This options is only in conjunction with the splitEntries.
+| password | consumer |  | String | Sets the password to be used for basic authentication when polling from a HTTP feed
+| sendEmptyMessageWhenIdle | consumer | false | boolean | If the polling consumer did not poll any files you can enable this option to send an empty message (no body) instead.
+| sortEntries | consumer | false | boolean | Sets whether to sort entries by published date. Only works when splitEntries = true.
+| splitEntries | consumer | true | boolean | Sets whether or not entries should be sent individually or whether the entire feed should be sent as a single message
+| throttleEntries | consumer | true | boolean | Sets whether all entries identified in a single feed poll should be delivered immediately. If true only one entry is processed per consumer.delay. Only applicable when splitEntries = true.
+| username | consumer |  | String | Sets the username to be used for basic authentication when polling from a HTTP feed
+| 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.
+| pollStrategy | consumer (advanced) |  | PollingConsumerPollStrategy | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.
+| exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange
+| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
+| backoffErrorThreshold | scheduler |  | int | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in.
+| backoffIdleThreshold | scheduler |  | int | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in.
+| backoffMultiplier | scheduler |  | int | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
+| delay | scheduler | 500 | long | Milliseconds before the next poll. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour).
+| greedy | scheduler | false | boolean | If greedy is enabled then the ScheduledPollConsumer will run immediately again if the previous run polled 1 or more messages.
+| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour).
+| runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.
+| scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.
+| scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler from either camel-spring or camel-quartz2 component
+| schedulerProperties | scheduler |  | Map | To configure additional properties when using a custom scheduler or any of the Quartz2 Spring based scheduler.
+| startScheduler | scheduler | true | boolean | Whether the scheduler should be auto started.
+| timeUnit | scheduler | MILLISECONDS | TimeUnit | Time unit for initialDelay and delay options.
+| useFixedDelay | scheduler | true | boolean | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details.
+|=======================================================================
+{% endraw %}
+// endpoint options: END
+
+
+You can append query options to the URI in the following format,
+`?option=value&option=value&...`
+
+[[Atom-Exchangedataformat]]
+Exchange data format
+^^^^^^^^^^^^^^^^^^^^
+
+Camel will set the In body on the returned `Exchange` with the entries.
+Depending on the `splitEntries` flag Camel will either return one
+`Entry` or a `List<Entry>`.
+
+[width="100%",cols="10%,10%,80%",options="header",]
+|=======================================================================
+|Option |Value |Behavior
+|`splitEntries` |`true` |Only a single entry from the currently being processed feed is set:
+`exchange.in.body(Entry)`
+
+|`splitEntries` |`false` |The entire list of entries from the feed is set:
+`exchange.in.body(List<Entry>)`
+|=======================================================================
+
+Camel can set the `Feed` object on the In header (see `feedHeader`
+option to disable this):
+
+[[Atom-MessageHeaders]]
+Message Headers
+^^^^^^^^^^^^^^^
+
+Camel atom uses these headers.
+
+[width="100%",cols="10%,90%",options="header",]
+|=======================================================================
+|Header |Description
+|`CamelAtomFeed` |When consuming the `org.apache.abdera.model.Feed` object is set to this
+header.
+|=======================================================================
+
+[[Atom-Samples]]
+Samples
+^^^^^^^
+
+In this sample we poll James Strachan's blog.
+
+[source,java]
+---------------------------------------------------------------------------------
+from("atom://http://macstrac.blogspot.com/feeds/posts/default").to("seda:feeds");
+---------------------------------------------------------------------------------
+
+In this sample we want to filter only good blogs we like to a SEDA
+queue. The sample also shows how to setup Camel standalone, not running
+in any Container or using Spring.
+
+[[Atom-SeeAlso]]
+See Also
+^^^^^^^^
+
+* link:configuring-camel.html[Configuring Camel]
+* link:component.html[Component]
+* link:endpoint.html[Endpoint]
+* link:getting-started.html[Getting Started]
+
+* link:rss.html[RSS]
+

http://git-wip-us.apache.org/repos/asf/camel/blob/9c0b7baf/components/camel-atom/src/main/docs/atom.adoc
----------------------------------------------------------------------
diff --git a/components/camel-atom/src/main/docs/atom.adoc b/components/camel-atom/src/main/docs/atom.adoc
deleted file mode 100644
index 7b50e21..0000000
--- a/components/camel-atom/src/main/docs/atom.adoc
+++ /dev/null
@@ -1,148 +0,0 @@
-[[Atom-AtomComponent]]
-Atom Component
-~~~~~~~~~~~~~~
-
-The *atom:* component is used for polling Atom feeds.
-
-Camel will poll the feed every 60 seconds by default. +
- *Note:* The component currently only supports polling (consuming)
-feeds.
-
-Maven users will need to add the following dependency to their `pom.xml`
-for this component:
-
-[source,xml]
-------------------------------------------------------------
-<dependency>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>camel-atom</artifactId>
-    <version>x.x.x</version>
-    <!-- use the same version as your Camel core version -->
-</dependency>
-------------------------------------------------------------
-
-[[Atom-URIformat]]
-URI format
-^^^^^^^^^^
-
-[source,java]
-------------------------
-atom://atomUri[?options]
-------------------------
-
-Where *atomUri* is the URI to the Atom feed to poll.
-
-[[Atom-Options]]
-Options
-^^^^^^^
-
-
-// component options: START
-The Atom component has no options.
-// component options: END
-
-
-
-// endpoint options: START
-The Atom component supports 28 endpoint options which are listed below:
-
-{% raw %}
-[width="100%",cols="2s,1,1m,1m,5",options="header"]
-|=======================================================================
-| Name | Group | Default | Java Type | Description
-| feedUri | consumer |  | String | *Required* The URI to the feed to poll.
-| bridgeErrorHandler | consumer | false | boolean | 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/ERROR level and ignored.
-| feedHeader | consumer | true | boolean | Sets whether to add the feed object as a header
-| filter | consumer | true | boolean | Sets whether to use filtering or not of the entries.
-| lastUpdate | consumer |  | Date | Sets the timestamp to be used for filtering entries from the atom feeds. This options is only in conjunction with the splitEntries.
-| password | consumer |  | String | Sets the password to be used for basic authentication when polling from a HTTP feed
-| sendEmptyMessageWhenIdle | consumer | false | boolean | If the polling consumer did not poll any files you can enable this option to send an empty message (no body) instead.
-| sortEntries | consumer | false | boolean | Sets whether to sort entries by published date. Only works when splitEntries = true.
-| splitEntries | consumer | true | boolean | Sets whether or not entries should be sent individually or whether the entire feed should be sent as a single message
-| throttleEntries | consumer | true | boolean | Sets whether all entries identified in a single feed poll should be delivered immediately. If true only one entry is processed per consumer.delay. Only applicable when splitEntries = true.
-| username | consumer |  | String | Sets the username to be used for basic authentication when polling from a HTTP feed
-| 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.
-| pollStrategy | consumer (advanced) |  | PollingConsumerPollStrategy | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.
-| exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange
-| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
-| backoffErrorThreshold | scheduler |  | int | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in.
-| backoffIdleThreshold | scheduler |  | int | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in.
-| backoffMultiplier | scheduler |  | int | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
-| delay | scheduler | 500 | long | Milliseconds before the next poll. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour).
-| greedy | scheduler | false | boolean | If greedy is enabled then the ScheduledPollConsumer will run immediately again if the previous run polled 1 or more messages.
-| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour).
-| runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.
-| scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.
-| scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler from either camel-spring or camel-quartz2 component
-| schedulerProperties | scheduler |  | Map | To configure additional properties when using a custom scheduler or any of the Quartz2 Spring based scheduler.
-| startScheduler | scheduler | true | boolean | Whether the scheduler should be auto started.
-| timeUnit | scheduler | MILLISECONDS | TimeUnit | Time unit for initialDelay and delay options.
-| useFixedDelay | scheduler | true | boolean | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details.
-|=======================================================================
-{% endraw %}
-// endpoint options: END
-
-
-You can append query options to the URI in the following format,
-`?option=value&option=value&...`
-
-[[Atom-Exchangedataformat]]
-Exchange data format
-^^^^^^^^^^^^^^^^^^^^
-
-Camel will set the In body on the returned `Exchange` with the entries.
-Depending on the `splitEntries` flag Camel will either return one
-`Entry` or a `List<Entry>`.
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Option |Value |Behavior
-|`splitEntries` |`true` |Only a single entry from the currently being processed feed is set:
-`exchange.in.body(Entry)`
-
-|`splitEntries` |`false` |The entire list of entries from the feed is set:
-`exchange.in.body(List<Entry>)`
-|=======================================================================
-
-Camel can set the `Feed` object on the In header (see `feedHeader`
-option to disable this):
-
-[[Atom-MessageHeaders]]
-Message Headers
-^^^^^^^^^^^^^^^
-
-Camel atom uses these headers.
-
-[width="100%",cols="10%,90%",options="header",]
-|=======================================================================
-|Header |Description
-|`CamelAtomFeed` |When consuming the `org.apache.abdera.model.Feed` object is set to this
-header.
-|=======================================================================
-
-[[Atom-Samples]]
-Samples
-^^^^^^^
-
-In this sample we poll James Strachan's blog.
-
-[source,java]
----------------------------------------------------------------------------------
-from("atom://http://macstrac.blogspot.com/feeds/posts/default").to("seda:feeds");
----------------------------------------------------------------------------------
-
-In this sample we want to filter only good blogs we like to a SEDA
-queue. The sample also shows how to setup Camel standalone, not running
-in any Container or using Spring.
-
-[[Atom-SeeAlso]]
-See Also
-^^^^^^^^
-
-* link:configuring-camel.html[Configuring Camel]
-* link:component.html[Component]
-* link:endpoint.html[Endpoint]
-* link:getting-started.html[Getting Started]
-
-* link:rss.html[RSS]
-

http://git-wip-us.apache.org/repos/asf/camel/blob/9c0b7baf/components/camel-avro/src/main/docs/avro-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-avro/src/main/docs/avro-component.adoc b/components/camel-avro/src/main/docs/avro-component.adoc
new file mode 100644
index 0000000..96b96ff
--- /dev/null
+++ b/components/camel-avro/src/main/docs/avro-component.adoc
@@ -0,0 +1,312 @@
+[[avro-AvroComponent]]
+Avro Component
+~~~~~~~~~~~~~~
+
+*Available as of Camel 2.10*
+
+This component provides a dataformat for avro, which allows
+serialization and deserialization of messages using Apache Avro's binary
+dataformat. Moreover, it provides support for Apache Avro's rpc, by
+providing producers and consumers endpoint for using avro over netty or
+http.
+
+Maven users will need to add the following dependency to their `pom.xml`
+for this component:
+
+[source,xml]
+------------------------------------------------------------
+<dependency>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>camel-avro</artifactId>
+    <version>x.x.x</version>
+    <!-- use the same version as your Camel core version -->
+</dependency>
+------------------------------------------------------------
+
+[[avro-ApacheAvroOverview]]
+Apache Avro Overview
+^^^^^^^^^^^^^^^^^^^^
+
+Avro allows you to define message types and a protocol using a json like
+format and then generate java code for the specified types and messages.
+An example of how a schema looks like is below.
+
+[source,xml]
+------------------------------------------------------------------------------------------
+{"namespace": "org.apache.camel.avro.generated",
+ "protocol": "KeyValueProtocol",
+
+ "types": [
+     {"name": "Key", "type": "record",
+      "fields": [
+          {"name": "key",   "type": "string"}
+      ]
+     },
+     {"name": "Value", "type": "record",
+      "fields": [
+          {"name": "value",   "type": "string"}
+      ]
+     }
+ ],
+
+ "messages": {
+     "put": {
+         "request": [{"name": "key", "type": "Key"}, {"name": "value", "type": "Value"} ],
+         "response": "null"
+     },
+     "get": {
+         "request": [{"name": "key", "type": "Key"}],
+         "response": "Value"
+     }
+ }
+}
+------------------------------------------------------------------------------------------
+
+You can easily generate classes from a schema, using maven, ant etc.
+More details can be found at the
+http://avro.apache.org/docs/current/[Apache Avro documentation].
+
+However, it doesn't enforce a schema first approach and you can create
+schema for your existing classes. *Since 2.12* you can use existing
+protocol interfaces to make RCP calls. You should use interface for the
+protocol itself and POJO beans or primitive/String classes for parameter
+and result types. Here is an example of the class that corresponds to
+schema above:
+
+[source,java]
+--------------------------------------------------------------
+package org.apache.camel.avro.reflection;
+
+public interface KeyValueProtocol {
+    void put(String key, Value value);
+    Value get(String key);
+}
+
+class Value {
+    private String value;
+    public String getValue() { return value; }
+    public void setValue(String value) { this.value = value; }
+}
+--------------------------------------------------------------
+
+_Note: Existing classes can be used only for RPC (see below), not in
+data format._
+
+[[avro-UsingtheAvrodataformat]]
+Using the Avro data format
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Using the avro data format is as easy as specifying that the class that
+you want to marshal or unmarshal in your route.
+
+[source,xml]
+--------------------------------------------------------------------------------
+    <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+        <route>
+            <from uri="direct:in"/>
+            <marshal>
+                <avro instanceClass="org.apache.camel.dataformat.avro.Message"/>
+            </marshal>
+            <to uri="log:out"/>
+        </route>
+    </camelContext>
+--------------------------------------------------------------------------------
+
+An alternative can be to specify the dataformat inside the context and
+reference it from your route.
+
+[source,xml]
+--------------------------------------------------------------------------------------
+    <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+         <dataFormats>
+            <avro id="avro" instanceClass="org.apache.camel.dataformat.avro.Message"/>
+        </dataFormats>
+        <route>
+            <from uri="direct:in"/>
+            <marshal ref="avro"/>
+            <to uri="log:out"/>
+        </route>
+    </camelContext>
+--------------------------------------------------------------------------------------
+
+In the same manner you can umarshal using the avro data format.
+
+[[avro-UsingAvroRPCinCamel]]
+Using Avro RPC in Camel
+^^^^^^^^^^^^^^^^^^^^^^^
+
+As mentioned above Avro also provides RPC support over multiple
+transports such as http and netty. Camel provides consumers and
+producers for these two transports.
+
+[source,java]
+----------------------------------------
+avro:[transport]:[host]:[port][?options]
+----------------------------------------
+
+The supported transport values are currently http or netty.
+
+*Since 2.12* you can specify message name right in the URI:
+
+[source,java]
+------------------------------------------------------
+avro:[transport]:[host]:[port][/messageName][?options]
+------------------------------------------------------
+
+For consumers this allows you to have multiple routes attached to the
+same socket. Dispatching to correct route will be done by the avro
+component automatically. Route with no messageName specified (if any)
+will be used as default.
+
+When using camel producers for avro ipc, the "in" message body needs to
+contain the parameters of the operation specified in the avro protocol.
+The response will be added in the body of the "out" message.
+
+In a similar manner when using camel avro consumers for avro ipc, the
+requests parameters will be placed inside the "in" message body of the
+created exchange and once the exchange is processed the body of the
+"out" message will be send as a response.
+
+*Note:* By default consumer parameters are wrapped into array. If you've
+got only one parameter, *since 2.12* you can use `singleParameter` URI
+option to receive it direcly in the "in" message body without array
+wrapping.
+
+[[avro-AvroRPCURIOptions]]
+Avro RPC URI Options
+^^^^^^^^^^^^^^^^^^^^
+
+
+
+
+// component options: START
+The Avro component supports 11 options which are listed below.
+
+
+
+{% raw %}
+[width="100%",cols="2s,1m,8",options="header"]
+|=======================================================================
+| Name | Java Type | Description
+| configuration | AvroConfiguration | To use a shared AvroConfiguration to configure options once. Properties of the shared configuration can also be set individually.
+| host | String | Hostname to use
+| port | int | Port number to use
+| protocol | Protocol | Avro protocol to use
+| transport | String | Transport to use
+| protocolLocation | String | Avro protocol location
+| protocolClassName | String | Avro protocol to use defined by the FQN class name
+| messageName | String | The name of the message to send.
+| uriAuthority | String | Authority to use (username and password)
+| reflectionProtocol | boolean | If protocol object provided is reflection protocol. Should be used only with protocol parameter because for protocolClassName protocol type will be auto detected
+| singleParameter | boolean | If true consumer parameter won't be wrapped into array. Will fail if protocol specifies more then 1 parameter for the message
+|=======================================================================
+{% endraw %}
+// component options: END
+
+
+
+
+
+// endpoint options: START
+The Avro component supports 14 endpoint options which are listed below:
+
+{% raw %}
+[width="100%",cols="2s,1,1m,1m,5",options="header"]
+|=======================================================================
+| Name | Group | Default | Java Type | Description
+| transport | common |  | AvroTransport | *Required* Transport to use
+| port | common |  | int | *Required* Port number to use
+| host | common |  | String | *Required* Hostname to use
+| messageName | common |  | String | The name of the message to send.
+| protocol | common |  | Protocol | Avro protocol to use
+| protocolClassName | common |  | String | Avro protocol to use defined by the FQN class name
+| protocolLocation | common |  | String | Avro protocol location
+| reflectionProtocol | common | false | boolean | If protocol object provided is reflection protocol. Should be used only with protocol parameter because for protocolClassName protocol type will be auto detected
+| singleParameter | common | false | boolean | If true consumer parameter won't be wrapped into array. Will fail if protocol specifies more then 1 parameter for the message
+| uriAuthority | common |  | String | Authority to use (username and password)
+| bridgeErrorHandler | consumer | false | boolean | 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/ERROR level and ignored.
+| 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 | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange
+| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
+|=======================================================================
+{% endraw %}
+// endpoint options: END
+
+
+[[avro-AvroRPCHeaders]]
+Avro RPC Headers
+^^^^^^^^^^^^^^^^
+
+[width="100%",cols="20%,80%",options="header",]
+|=======================================================================
+|Name |Description
+
+|`CamelAvroMessageName` |The name of the message to send. In consumer overrides message name from
+URI (if any)
+|=======================================================================
+
+[[avro-Examples]]
+Examples
+^^^^^^^^
+
+An example of using camel avro producers via http:
+
+[source,xml]
+---------------------------------------------------------------------------------------------------------------------------
+        <route>
+            <from uri="direct:start"/>
+            <to uri="avro:http:localhost:{{avroport}}?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocol"/>
+            <to uri="log:avro"/>
+        </route>
+---------------------------------------------------------------------------------------------------------------------------
+
+In the example above you need to fill `CamelAvroMessageName` header.
+*Since 2.12* you can use following syntax to call constant messages:
+
+[source,xml]
+-------------------------------------------------------------------------------------------------------------------------------
+        <route>
+            <from uri="direct:start"/>
+            <to uri="avro:http:localhost:{{avroport}}/put?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocol"/>
+            <to uri="log:avro"/>
+        </route>
+-------------------------------------------------------------------------------------------------------------------------------
+
+An example of consuming messages using camel avro consumers via netty:
+
+[source,xml]
+------------------------------------------------------------------------------------------------------------------------------
+        <route>
+            <from uri="avro:netty:localhost:{{avroport}}?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocol"/>
+            <choice>
+                <when>
+                    <el>${in.headers.CamelAvroMessageName == 'put'}</el>
+                    <process ref="putProcessor"/>
+                </when>
+                <when>
+                    <el>${in.headers.CamelAvroMessageName == 'get'}</el>
+                    <process ref="getProcessor"/>
+                </when>
+            </choice>
+        </route>
+------------------------------------------------------------------------------------------------------------------------------
+
+*Since 2.12* you can set up two distinct routes to perform the same
+task:
+
+[source,xml]
+-------------------------------------------------------------------------------------------------------------------------------------------------------
+        <route>
+            <from uri="avro:netty:localhost:{{avroport}}/put?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocol">
+            <process ref="putProcessor"/>
+        </route>
+        <route>
+            <from uri="avro:netty:localhost:{{avroport}}/get?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocol&singleParameter=true"/>
+            <process ref="getProcessor"/>
+        </route>
+-------------------------------------------------------------------------------------------------------------------------------------------------------
+
+In the example above, get takes only one parameter, so `singleParameter`
+is used and `getProcessor` will receive Value class directly in body,
+while `putProcessor` will receive an array of size 2 with String key and
+Value value filled as array contents.

http://git-wip-us.apache.org/repos/asf/camel/blob/9c0b7baf/components/camel-avro/src/main/docs/avro.adoc
----------------------------------------------------------------------
diff --git a/components/camel-avro/src/main/docs/avro.adoc b/components/camel-avro/src/main/docs/avro.adoc
deleted file mode 100644
index 96b96ff..0000000
--- a/components/camel-avro/src/main/docs/avro.adoc
+++ /dev/null
@@ -1,312 +0,0 @@
-[[avro-AvroComponent]]
-Avro Component
-~~~~~~~~~~~~~~
-
-*Available as of Camel 2.10*
-
-This component provides a dataformat for avro, which allows
-serialization and deserialization of messages using Apache Avro's binary
-dataformat. Moreover, it provides support for Apache Avro's rpc, by
-providing producers and consumers endpoint for using avro over netty or
-http.
-
-Maven users will need to add the following dependency to their `pom.xml`
-for this component:
-
-[source,xml]
-------------------------------------------------------------
-<dependency>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>camel-avro</artifactId>
-    <version>x.x.x</version>
-    <!-- use the same version as your Camel core version -->
-</dependency>
-------------------------------------------------------------
-
-[[avro-ApacheAvroOverview]]
-Apache Avro Overview
-^^^^^^^^^^^^^^^^^^^^
-
-Avro allows you to define message types and a protocol using a json like
-format and then generate java code for the specified types and messages.
-An example of how a schema looks like is below.
-
-[source,xml]
-------------------------------------------------------------------------------------------
-{"namespace": "org.apache.camel.avro.generated",
- "protocol": "KeyValueProtocol",
-
- "types": [
-     {"name": "Key", "type": "record",
-      "fields": [
-          {"name": "key",   "type": "string"}
-      ]
-     },
-     {"name": "Value", "type": "record",
-      "fields": [
-          {"name": "value",   "type": "string"}
-      ]
-     }
- ],
-
- "messages": {
-     "put": {
-         "request": [{"name": "key", "type": "Key"}, {"name": "value", "type": "Value"} ],
-         "response": "null"
-     },
-     "get": {
-         "request": [{"name": "key", "type": "Key"}],
-         "response": "Value"
-     }
- }
-}
-------------------------------------------------------------------------------------------
-
-You can easily generate classes from a schema, using maven, ant etc.
-More details can be found at the
-http://avro.apache.org/docs/current/[Apache Avro documentation].
-
-However, it doesn't enforce a schema first approach and you can create
-schema for your existing classes. *Since 2.12* you can use existing
-protocol interfaces to make RCP calls. You should use interface for the
-protocol itself and POJO beans or primitive/String classes for parameter
-and result types. Here is an example of the class that corresponds to
-schema above:
-
-[source,java]
---------------------------------------------------------------
-package org.apache.camel.avro.reflection;
-
-public interface KeyValueProtocol {
-    void put(String key, Value value);
-    Value get(String key);
-}
-
-class Value {
-    private String value;
-    public String getValue() { return value; }
-    public void setValue(String value) { this.value = value; }
-}
---------------------------------------------------------------
-
-_Note: Existing classes can be used only for RPC (see below), not in
-data format._
-
-[[avro-UsingtheAvrodataformat]]
-Using the Avro data format
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Using the avro data format is as easy as specifying that the class that
-you want to marshal or unmarshal in your route.
-
-[source,xml]
---------------------------------------------------------------------------------
-    <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
-        <route>
-            <from uri="direct:in"/>
-            <marshal>
-                <avro instanceClass="org.apache.camel.dataformat.avro.Message"/>
-            </marshal>
-            <to uri="log:out"/>
-        </route>
-    </camelContext>
---------------------------------------------------------------------------------
-
-An alternative can be to specify the dataformat inside the context and
-reference it from your route.
-
-[source,xml]
---------------------------------------------------------------------------------------
-    <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
-         <dataFormats>
-            <avro id="avro" instanceClass="org.apache.camel.dataformat.avro.Message"/>
-        </dataFormats>
-        <route>
-            <from uri="direct:in"/>
-            <marshal ref="avro"/>
-            <to uri="log:out"/>
-        </route>
-    </camelContext>
---------------------------------------------------------------------------------------
-
-In the same manner you can umarshal using the avro data format.
-
-[[avro-UsingAvroRPCinCamel]]
-Using Avro RPC in Camel
-^^^^^^^^^^^^^^^^^^^^^^^
-
-As mentioned above Avro also provides RPC support over multiple
-transports such as http and netty. Camel provides consumers and
-producers for these two transports.
-
-[source,java]
-----------------------------------------
-avro:[transport]:[host]:[port][?options]
-----------------------------------------
-
-The supported transport values are currently http or netty.
-
-*Since 2.12* you can specify message name right in the URI:
-
-[source,java]
-------------------------------------------------------
-avro:[transport]:[host]:[port][/messageName][?options]
-------------------------------------------------------
-
-For consumers this allows you to have multiple routes attached to the
-same socket. Dispatching to correct route will be done by the avro
-component automatically. Route with no messageName specified (if any)
-will be used as default.
-
-When using camel producers for avro ipc, the "in" message body needs to
-contain the parameters of the operation specified in the avro protocol.
-The response will be added in the body of the "out" message.
-
-In a similar manner when using camel avro consumers for avro ipc, the
-requests parameters will be placed inside the "in" message body of the
-created exchange and once the exchange is processed the body of the
-"out" message will be send as a response.
-
-*Note:* By default consumer parameters are wrapped into array. If you've
-got only one parameter, *since 2.12* you can use `singleParameter` URI
-option to receive it direcly in the "in" message body without array
-wrapping.
-
-[[avro-AvroRPCURIOptions]]
-Avro RPC URI Options
-^^^^^^^^^^^^^^^^^^^^
-
-
-
-
-// component options: START
-The Avro component supports 11 options which are listed below.
-
-
-
-{% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
-|=======================================================================
-| Name | Java Type | Description
-| configuration | AvroConfiguration | To use a shared AvroConfiguration to configure options once. Properties of the shared configuration can also be set individually.
-| host | String | Hostname to use
-| port | int | Port number to use
-| protocol | Protocol | Avro protocol to use
-| transport | String | Transport to use
-| protocolLocation | String | Avro protocol location
-| protocolClassName | String | Avro protocol to use defined by the FQN class name
-| messageName | String | The name of the message to send.
-| uriAuthority | String | Authority to use (username and password)
-| reflectionProtocol | boolean | If protocol object provided is reflection protocol. Should be used only with protocol parameter because for protocolClassName protocol type will be auto detected
-| singleParameter | boolean | If true consumer parameter won't be wrapped into array. Will fail if protocol specifies more then 1 parameter for the message
-|=======================================================================
-{% endraw %}
-// component options: END
-
-
-
-
-
-// endpoint options: START
-The Avro component supports 14 endpoint options which are listed below:
-
-{% raw %}
-[width="100%",cols="2s,1,1m,1m,5",options="header"]
-|=======================================================================
-| Name | Group | Default | Java Type | Description
-| transport | common |  | AvroTransport | *Required* Transport to use
-| port | common |  | int | *Required* Port number to use
-| host | common |  | String | *Required* Hostname to use
-| messageName | common |  | String | The name of the message to send.
-| protocol | common |  | Protocol | Avro protocol to use
-| protocolClassName | common |  | String | Avro protocol to use defined by the FQN class name
-| protocolLocation | common |  | String | Avro protocol location
-| reflectionProtocol | common | false | boolean | If protocol object provided is reflection protocol. Should be used only with protocol parameter because for protocolClassName protocol type will be auto detected
-| singleParameter | common | false | boolean | If true consumer parameter won't be wrapped into array. Will fail if protocol specifies more then 1 parameter for the message
-| uriAuthority | common |  | String | Authority to use (username and password)
-| bridgeErrorHandler | consumer | false | boolean | 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/ERROR level and ignored.
-| 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 | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange
-| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
-|=======================================================================
-{% endraw %}
-// endpoint options: END
-
-
-[[avro-AvroRPCHeaders]]
-Avro RPC Headers
-^^^^^^^^^^^^^^^^
-
-[width="100%",cols="20%,80%",options="header",]
-|=======================================================================
-|Name |Description
-
-|`CamelAvroMessageName` |The name of the message to send. In consumer overrides message name from
-URI (if any)
-|=======================================================================
-
-[[avro-Examples]]
-Examples
-^^^^^^^^
-
-An example of using camel avro producers via http:
-
-[source,xml]
----------------------------------------------------------------------------------------------------------------------------
-        <route>
-            <from uri="direct:start"/>
-            <to uri="avro:http:localhost:{{avroport}}?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocol"/>
-            <to uri="log:avro"/>
-        </route>
----------------------------------------------------------------------------------------------------------------------------
-
-In the example above you need to fill `CamelAvroMessageName` header.
-*Since 2.12* you can use following syntax to call constant messages:
-
-[source,xml]
--------------------------------------------------------------------------------------------------------------------------------
-        <route>
-            <from uri="direct:start"/>
-            <to uri="avro:http:localhost:{{avroport}}/put?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocol"/>
-            <to uri="log:avro"/>
-        </route>
--------------------------------------------------------------------------------------------------------------------------------
-
-An example of consuming messages using camel avro consumers via netty:
-
-[source,xml]
-------------------------------------------------------------------------------------------------------------------------------
-        <route>
-            <from uri="avro:netty:localhost:{{avroport}}?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocol"/>
-            <choice>
-                <when>
-                    <el>${in.headers.CamelAvroMessageName == 'put'}</el>
-                    <process ref="putProcessor"/>
-                </when>
-                <when>
-                    <el>${in.headers.CamelAvroMessageName == 'get'}</el>
-                    <process ref="getProcessor"/>
-                </when>
-            </choice>
-        </route>
-------------------------------------------------------------------------------------------------------------------------------
-
-*Since 2.12* you can set up two distinct routes to perform the same
-task:
-
-[source,xml]
--------------------------------------------------------------------------------------------------------------------------------------------------------
-        <route>
-            <from uri="avro:netty:localhost:{{avroport}}/put?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocol">
-            <process ref="putProcessor"/>
-        </route>
-        <route>
-            <from uri="avro:netty:localhost:{{avroport}}/get?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocol&singleParameter=true"/>
-            <process ref="getProcessor"/>
-        </route>
--------------------------------------------------------------------------------------------------------------------------------------------------------
-
-In the example above, get takes only one parameter, so `singleParameter`
-is used and `getProcessor` will receive Value class directly in body,
-while `putProcessor` will receive an array of size 2 with String key and
-Value value filled as array contents.

http://git-wip-us.apache.org/repos/asf/camel/blob/9c0b7baf/components/camel-aws/src/main/docs/aws-cw-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/docs/aws-cw-component.adoc b/components/camel-aws/src/main/docs/aws-cw-component.adoc
new file mode 100644
index 0000000..2bf859f
--- /dev/null
+++ b/components/camel-aws/src/main/docs/aws-cw-component.adoc
@@ -0,0 +1,165 @@
+[[AWS-CW-CWComponent]]
+CW Component
+~~~~~~~~~~~~
+
+*Available as of Camel 2.11
+
+The CW component allows messages to be sent to an
+http://aws.amazon.com/cloudwatch/[Amazon CloudWatch] metrics. The
+implementation of the Amazon API is provided by
+the http://aws.amazon.com/sdkforjava/[AWS SDK].
+
+Prerequisites
+
+You must have a valid Amazon Web Services developer account, and be
+signed up to use Amazon CloudWatch. More information are available at
+http://aws.amazon.com/cloudwatch/[Amazon CloudWatch].
+
+[[AWS-CW-URIFormat]]
+URI Format
+^^^^^^^^^^
+
+[source,java]
+----------------------------
+aws-cw://namespace[?options]
+----------------------------
+
+The metrics will be created if they don't already exists. +
+ You can append query options to the URI in the following format,
+`?options=value&option2=value&...`
+
+[[AWS-CW-URIOptions]]
+URI Options
+^^^^^^^^^^^
+
+
+// component options: START
+The AWS CloudWatch component has no options.
+// component options: END
+
+
+
+
+// endpoint options: START
+The AWS CloudWatch component supports 13 endpoint options which are listed below:
+
+{% raw %}
+[width="100%",cols="2s,1,1m,1m,5",options="header"]
+|=======================================================================
+| Name | Group | Default | Java Type | Description
+| namespace | producer |  | String | *Required* The metric namespace
+| accessKey | producer |  | String | Amazon AWS Access Key
+| amazonCwClient | producer |  | AmazonCloudWatch | To use the AmazonCloudWatch as the client
+| amazonCwEndpoint | producer |  | String | The region with which the AWS-CW client wants to work with.
+| name | producer |  | String | The metric name
+| proxyHost | producer |  | String | To define a proxy host when instantiating the SQS client
+| proxyPort | producer |  | Integer | To define a proxy port when instantiating the SQS client
+| secretKey | producer |  | String | Amazon AWS Secret Key
+| timestamp | producer |  | Date | The metric timestamp
+| unit | producer |  | String | The metric unit
+| value | producer |  | Double | The metric value
+| exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange
+| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
+|=======================================================================
+{% endraw %}
+// endpoint options: END
+
+
+
+Required CW component options
+
+You have to provide the amazonCwClient in the
+link:registry.html[Registry] or your accessKey and secretKey to access
+the http://aws.amazon.com/cloudwatch/[Amazon's CloudWatch].
+
+[[AWS-CW-Usage]]
+Usage
+^^^^^
+
+[[AWS-CW-MessageheadersevaluatedbytheCWproducer]]
+Message headers evaluated by the CW producer
+++++++++++++++++++++++++++++++++++++++++++++
+
+[width="100%",cols="10%,10%,80%",options="header",]
+|=======================================================================
+|Header |Type |Description
+
+|`CamelAwsCwMetricName` |`String` |The Amazon CW metric name.
+
+|`CamelAwsCwMetricValue` |`Double` |The Amazon CW metric value.
+
+|`CamelAwsCwMetricUnit` |`String` |The Amazon CW metric unit.
+
+|`CamelAwsCwMetricNamespace` |`String` |The Amazon CW metric namespace.
+
+|`CamelAwsCwMetricTimestamp` |`Date` |The Amazon CW metric timestamp.
+
+|`CamelAwsCwMetricDimensionName` |`String` |*Camel 2.12:* The Amazon CW metric dimension name.
+
+|`CamelAwsCwMetricDimensionValue` |`String` |*Camel 2.12:* The Amazon CW metric dimension value.
+
+|`CamelAwsCwMetricDimensions` |`Map<String, String>` |*Camel 2.12:* A map of dimension names and dimension values.
+|=======================================================================
+
+[[AWS-CW-AdvancedAmazonCloudWatchconfiguration]]
+Advanced AmazonCloudWatch configuration
++++++++++++++++++++++++++++++++++++++++
+
+If you need more control over the `AmazonCloudWatch` instance
+configuration you can create your own instance and refer to it from the
+URI:
+
+[source,java]
+-------------------------------------------------
+from("direct:start")
+.to("aws-cw://namepsace?amazonCwClient=#client");
+-------------------------------------------------
+
+The `#client` refers to a `AmazonCloudWatch` in the
+link:registry.html[Registry].
+
+For example if your Camel Application is running behind a firewall:
+
+[source,java]
+------------------------------------------------------------------------------------------
+AWSCredentials awsCredentials = new BasicAWSCredentials("myAccessKey", "mySecretKey");
+ClientConfiguration clientConfiguration = new ClientConfiguration();
+clientConfiguration.setProxyHost("http://myProxyHost");
+clientConfiguration.setProxyPort(8080);
+
+AmazonCloudWatch client = new AmazonCloudWatchClient(awsCredentials, clientConfiguration);
+
+registry.bind("client", client);
+------------------------------------------------------------------------------------------
+
+[[AWS-CW-Dependencies]]
+Dependencies
+^^^^^^^^^^^^
+
+Maven users will need to add the following dependency to their pom.xml.
+
+*pom.xml*
+
+[source,xml]
+---------------------------------------
+<dependency>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>camel-aws</artifactId>
+    <version>${camel-version}</version>
+</dependency>
+---------------------------------------
+
+where `${camel-version`} must be replaced by the actual version of Camel
+(2.10 or higher).
+
+[[AWS-CW-SeeAlso]]
+See Also
+^^^^^^^^
+
+* link:configuring-camel.html[Configuring Camel]
+* link:component.html[Component]
+* link:endpoint.html[Endpoint]
+* link:getting-started.html[Getting Started]
+
+* link:aws.html[AWS Component]
+

http://git-wip-us.apache.org/repos/asf/camel/blob/9c0b7baf/components/camel-aws/src/main/docs/aws-cw.adoc
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/docs/aws-cw.adoc b/components/camel-aws/src/main/docs/aws-cw.adoc
deleted file mode 100644
index 2bf859f..0000000
--- a/components/camel-aws/src/main/docs/aws-cw.adoc
+++ /dev/null
@@ -1,165 +0,0 @@
-[[AWS-CW-CWComponent]]
-CW Component
-~~~~~~~~~~~~
-
-*Available as of Camel 2.11
-
-The CW component allows messages to be sent to an
-http://aws.amazon.com/cloudwatch/[Amazon CloudWatch] metrics. The
-implementation of the Amazon API is provided by
-the http://aws.amazon.com/sdkforjava/[AWS SDK].
-
-Prerequisites
-
-You must have a valid Amazon Web Services developer account, and be
-signed up to use Amazon CloudWatch. More information are available at
-http://aws.amazon.com/cloudwatch/[Amazon CloudWatch].
-
-[[AWS-CW-URIFormat]]
-URI Format
-^^^^^^^^^^
-
-[source,java]
-----------------------------
-aws-cw://namespace[?options]
-----------------------------
-
-The metrics will be created if they don't already exists. +
- You can append query options to the URI in the following format,
-`?options=value&option2=value&...`
-
-[[AWS-CW-URIOptions]]
-URI Options
-^^^^^^^^^^^
-
-
-// component options: START
-The AWS CloudWatch component has no options.
-// component options: END
-
-
-
-
-// endpoint options: START
-The AWS CloudWatch component supports 13 endpoint options which are listed below:
-
-{% raw %}
-[width="100%",cols="2s,1,1m,1m,5",options="header"]
-|=======================================================================
-| Name | Group | Default | Java Type | Description
-| namespace | producer |  | String | *Required* The metric namespace
-| accessKey | producer |  | String | Amazon AWS Access Key
-| amazonCwClient | producer |  | AmazonCloudWatch | To use the AmazonCloudWatch as the client
-| amazonCwEndpoint | producer |  | String | The region with which the AWS-CW client wants to work with.
-| name | producer |  | String | The metric name
-| proxyHost | producer |  | String | To define a proxy host when instantiating the SQS client
-| proxyPort | producer |  | Integer | To define a proxy port when instantiating the SQS client
-| secretKey | producer |  | String | Amazon AWS Secret Key
-| timestamp | producer |  | Date | The metric timestamp
-| unit | producer |  | String | The metric unit
-| value | producer |  | Double | The metric value
-| exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange
-| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
-|=======================================================================
-{% endraw %}
-// endpoint options: END
-
-
-
-Required CW component options
-
-You have to provide the amazonCwClient in the
-link:registry.html[Registry] or your accessKey and secretKey to access
-the http://aws.amazon.com/cloudwatch/[Amazon's CloudWatch].
-
-[[AWS-CW-Usage]]
-Usage
-^^^^^
-
-[[AWS-CW-MessageheadersevaluatedbytheCWproducer]]
-Message headers evaluated by the CW producer
-++++++++++++++++++++++++++++++++++++++++++++
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Header |Type |Description
-
-|`CamelAwsCwMetricName` |`String` |The Amazon CW metric name.
-
-|`CamelAwsCwMetricValue` |`Double` |The Amazon CW metric value.
-
-|`CamelAwsCwMetricUnit` |`String` |The Amazon CW metric unit.
-
-|`CamelAwsCwMetricNamespace` |`String` |The Amazon CW metric namespace.
-
-|`CamelAwsCwMetricTimestamp` |`Date` |The Amazon CW metric timestamp.
-
-|`CamelAwsCwMetricDimensionName` |`String` |*Camel 2.12:* The Amazon CW metric dimension name.
-
-|`CamelAwsCwMetricDimensionValue` |`String` |*Camel 2.12:* The Amazon CW metric dimension value.
-
-|`CamelAwsCwMetricDimensions` |`Map<String, String>` |*Camel 2.12:* A map of dimension names and dimension values.
-|=======================================================================
-
-[[AWS-CW-AdvancedAmazonCloudWatchconfiguration]]
-Advanced AmazonCloudWatch configuration
-+++++++++++++++++++++++++++++++++++++++
-
-If you need more control over the `AmazonCloudWatch` instance
-configuration you can create your own instance and refer to it from the
-URI:
-
-[source,java]
--------------------------------------------------
-from("direct:start")
-.to("aws-cw://namepsace?amazonCwClient=#client");
--------------------------------------------------
-
-The `#client` refers to a `AmazonCloudWatch` in the
-link:registry.html[Registry].
-
-For example if your Camel Application is running behind a firewall:
-
-[source,java]
-------------------------------------------------------------------------------------------
-AWSCredentials awsCredentials = new BasicAWSCredentials("myAccessKey", "mySecretKey");
-ClientConfiguration clientConfiguration = new ClientConfiguration();
-clientConfiguration.setProxyHost("http://myProxyHost");
-clientConfiguration.setProxyPort(8080);
-
-AmazonCloudWatch client = new AmazonCloudWatchClient(awsCredentials, clientConfiguration);
-
-registry.bind("client", client);
-------------------------------------------------------------------------------------------
-
-[[AWS-CW-Dependencies]]
-Dependencies
-^^^^^^^^^^^^
-
-Maven users will need to add the following dependency to their pom.xml.
-
-*pom.xml*
-
-[source,xml]
----------------------------------------
-<dependency>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>camel-aws</artifactId>
-    <version>${camel-version}</version>
-</dependency>
----------------------------------------
-
-where `${camel-version`} must be replaced by the actual version of Camel
-(2.10 or higher).
-
-[[AWS-CW-SeeAlso]]
-See Also
-^^^^^^^^
-
-* link:configuring-camel.html[Configuring Camel]
-* link:component.html[Component]
-* link:endpoint.html[Endpoint]
-* link:getting-started.html[Getting Started]
-
-* link:aws.html[AWS Component]
-


Mime
View raw message