You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/08/16 08:03:26 UTC

[02/51] [partial] camel git commit: CAMEL-9541: Use -component as suffix for component docs.

http://git-wip-us.apache.org/repos/asf/camel/blob/9c0b7baf/components/camel-metrics/src/main/docs/metrics-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/main/docs/metrics-component.adoc b/components/camel-metrics/src/main/docs/metrics-component.adoc
new file mode 100644
index 0000000..b05f500
--- /dev/null
+++ b/components/camel-metrics/src/main/docs/metrics-component.adoc
@@ -0,0 +1,569 @@
+ifdef::env-github[]
+:caution-caption: :boom:
+:important-caption: :exclamation:
+:note-caption: :information_source:
+:tip-caption: :bulb:
+:warning-caption: :warning:
+endif::[]
+
+[[MetricsComponent-MetricsComponent]]
+Metrics Component
+~~~~~~~~~~~~~~~~~
+
+*Available as of Camel 2.14*
+
+The�**metrics:**�component allows to collect various metrics directly
+from Camel routes. Supported metric types
+are�link:#MetricsComponent-counter[counter],�link:#MetricsComponent-histogram[histogram],
+link:#MetricsComponent-meter[meter]�and�link:#MetricsComponent-timer[timer].�http://metrics.dropwizard.io[Metrics]�provides
+simple way to measure behaviour of application. Configurable
+reporting�backend�is enabling different integration options for
+collecting and visualizing statistics. The component also provides
+a�`MetricsRoutePolicyFactory` which allows to expose route statistics
+using Dropwizard Metrics, see bottom of page for details.
+
+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-metrics</artifactId>
+    <version>x.x.x</version>
+    <!-- use the same version as your Camel core version -->
+</dependency>
+----
+
+[[MetricsComponent-URIformat]]
+URI format
+^^^^^^^^^^
+
+[source]
+----
+metrics:[ meter | counter | histogram | timer ]:metricname[?options]
+----
+
+[[MetricsComponent-registryMetricRegistry]]
+[[MetricsComponent-registry]]Metric Registry
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Camel Metrics component uses by default a `MetricRegistry` instance with
+a `Slf4jReporter` that has a 60 second reporting interval.
+This default registry can be replaced with a custom one by providing
+a `MetricRegistry` bean. If multiple `MetricRegistry` beans exist in the
+application, the one with name `metricRegistry` is used.
+
+For example using Spring Java Configuration:
+
+[source,java]
+----
+@Configuration
+public static class MyConfig extends SingleRouteCamelConfiguration {
+
+    @Bean
+    @Override
+    public RouteBuilder route() {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                // define Camel routes here
+            }
+        };
+    }
+
+    @Bean(name = MetricsComponent.METRIC_REGISTRY_NAME)
+    public MetricRegistry getMetricRegistry() {
+        MetricRegistry registry = ...;
+        return registry;
+    }
+}
+----
+
+Or using CDI:
+[source,java]
+----
+class MyBean extends RouteBuilder {
+
+    @Override
+    public void configure() {
+      from("...")
+          // Register the 'my-meter' meter in the MetricRegistry below
+          .to("metrics:meter:my-meter");
+    }
+
+    @Produces
+    // If multiple MetricRegistry beans
+    // @Named(MetricsComponent.METRIC_REGISTRY_NAME)
+    MetricRegistry registry() {
+        MetricRegistry registry = new MetricRegistry();
+        // ...
+        return registry;
+    }
+}
+----
+
+CAUTION: `MetricRegistry` uses internal thread(s) for reporting. There is no
+public API in version `3.0.1` for users to clean up on exit. Thus using
+Camel Metrics Component leads to Java classloader leak and my cause
+`OutOfMemoryErrors` in some cases.
+
+[[MetricsComponent-Usage]]
+Usage
+^^^^^
+
+Each metric has type and name. Supported types are
+link:#MetricsComponent-counter[counter],
+link:#MetricsComponent-histogram[histogram],�link:#MetricsComponent-meter[meter]�and
+link:#MetricsComponent-timer[timer]. Metric name is simple string. If
+metric type is not provided then type meter is used by default.
+
+[[MetricsComponent-Headers]]
+Headers
++++++++
+
+Metric name defined in URI can be overridden by using header with name
+`CamelMetricsName`.
+
+For example
+
+[source,java]
+----
+from("direct:in")
+    .setHeader(MetricsConstants.HEADER_METRIC_NAME, constant("new.name"))
+    .to("metrics:counter:name.not.used")
+    .to("direct:out");
+----
+
+will update counter with name `new.name` instead of `name.not.used`.
+
+All Metrics specific headers are removed from the message once Metrics
+endpoint finishes processing of exchange. While processing exchange
+Metrics endpoint will catch all exceptions and write log entry using
+level `warn`.
+
+[[MetricsComponent-counterMetricstypecounter]]
+[[MetricsComponent-counter]]Metrics type counter
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+[source]
+----
+metrics:counter:metricname[?options]
+----
+
+[[MetricsComponent-Options]]
+Options
++++++++
+
+[width="100%",cols="10%,10%,80%",options="header",]
+|=====================================================
+|Name |Default |Description
+|increment� |- |Long value to add to the counter
+|decrement |- |Long value to subtract from the counter
+|=====================================================
+
+If neither `increment` or `decrement` is defined then counter value will
+be incremented by one. If `increment` and `decrement` are both defined
+only increment operation is called.�
+
+[source,java]
+----
+// update counter simple.counter by 7
+from("direct:in")
+    .to("metric:counter:simple.counter?increment=7")
+    .to("direct:out");
+----
+
+[source,java]
+----
+// increment counter simple.counter by 1
+from("direct:in")
+    .to("metric:counter:simple.counter")
+    .to("direct:out");
+----
+
+[source,java]
+----
+// decrement counter simple.counter by 3
+from("direct:in")
+    .to("metric:counter:simple.counter?decrement=3")
+    .to("direct:out");
+----
+
+[[MetricsComponent-Headers.1]]
+Headers
++++++++
+
+Message headers can be used to override `increment` and `decrement`
+values specified in Metrics component URI.
+
+[width="100%",cols="10%,80%,10%",options="header",]
+|====================================================================
+|Name |Description |Expected type
+|CamelMetricsCounterIncrement� |Override increment value in URI |Long
+|CamelMetricsCounterDecrement� |Override decrement value in URI |Long
+|====================================================================
+
+[source,java]
+----
+// update counter simple.counter by 417
+from("direct:in")
+    .setHeader(MetricsConstants.HEADER_COUNTER_INCREMENT, constant(417L))
+    .to("metric:counter:simple.counter?increment=7")
+    .to("direct:out");
+----
+
+[source,java]
+----
+// updates counter using simple language to evaluate body.length
+from("direct:in")
+    .setHeader(MetricsConstants.HEADER_COUNTER_INCREMENT, simple("${body.length}"))
+    .to("metrics:counter:body.length")
+    .to("mock:out");
+
+----
+
+[[MetricsComponent-histogramMetrictypehistogram]]
+[[MetricsComponent-histogram]]Metric type histogram
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+[source]
+----
+metrics:histogram:metricname[?options]
+----
+
+[[MetricsComponent-Options.1]]
+Options
++++++++
+
+[width="100%",cols="10%,10%,80%",options="header",]
+|===================================
+|Name |Default |Description
+|value |- |Value to use in histogram
+|===================================
+
+If no `value` is not set nothing is added to histogram and warning is
+logged.
+
+[source,java]
+----
+// adds value 9923 to simple.histogram
+from("direct:in")
+    .to("metric:histogram:simple.histogram?value=9923")
+    .to("direct:out");
+----
+
+[source,java]
+----
+// nothing is added to simple.histogram; warning is logged
+from("direct:in")
+    .to("metric:histogram:simple.histogram")
+    .to("direct:out");
+
+----
+
+[[MetricsComponent-Headers.2]]
+Headers
++++++++
+
+Message header can be used to override value specified in Metrics
+component URI.
+
+[width="100%",cols="10%,80%,10%",options="header",]
+|=================================================================
+|Name |Description |Expected type
+|CamelMetricsHistogramValue |Override histogram value in URI |Long
+|=================================================================
+
+[source,java]
+----
+// adds value 992 to simple.histogram
+from("direct:in")
+    .setHeader(MetricsConstants.HEADER_HISTOGRAM_VALUE, constant(992L))
+    .to("metric:histogram:simple.histogram?value=700")
+    .to("direct:out")
+
+----
+
+[[MetricsComponent-meterMetrictypemeter]]
+[[MetricsComponent-meter]]Metric type meter
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+[source]
+----
+metrics:meter:metricname[?options]
+----
+
+[[MetricsComponent-Options.2]]
+Options
++++++++
+
+[width="100%",cols="10%,10%,80%",options="header",]
+|===================================
+|Name |Default |Description
+|mark� |- |Long value to use as mark
+|===================================
+
+If `mark` is not set then�`meter.mark()` is called without argument.
+
+[source,java]
+----
+// marks simple.meter without value
+from("direct:in")
+    .to("metric:simple.meter")
+    .to("direct:out");
+----
+
+[source,java]
+----
+// marks simple.meter with value 81
+from("direct:in")
+    .to("metric:meter:simple.meter?mark=81")
+    .to("direct:out");
+----
+
+[[MetricsComponent-Headers.3]]
+Headers
++++++++
+
+Message header can be used to override `mark` value specified in Metrics
+component URI.
+
+[width="100%",cols="10%,80%,10%",options="header",]
+|=======================================================
+|Name |Description |Expected type
+|CamelMetricsMeterMark |Override mark value in URI |Long
+|=======================================================
+
+[source,java]
+----
+// updates meter simple.meter with value 345
+from("direct:in")
+    .setHeader(MetricsConstants.HEADER_METER_MARK, constant(345L))
+    .to("metric:meter:simple.meter?mark=123")
+    .to("direct:out");
+----
+
+[[MetricsComponent-timerMetricstypetimer]]
+[[MetricsComponent-timer]]Metrics type timer
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+[source]
+----
+metrics:timer:metricname[?options]
+----
+
+[[MetricsComponent-Options.3]]
+Options
++++++++
+
+[width="100%",cols="10%,10%,80%",options="header",]
+|==========================
+|Name |Default |Description
+|action |- |start or stop
+|==========================
+
+If no `action` or invalid value is provided then warning is logged
+without any timer update. If action `start` is called on already running
+timer or `stop` is called on not running timer then nothing is updated
+and warning is logged.
+
+[source,java]
+----
+// measure time taken by route "calculate"
+from("direct:in")
+    .to("metrics:timer:simple.timer?action=start")
+    .to("direct:calculate")
+    .to("metrics:timer:simple.timer?action=stop");
+----
+
+`TimerContext` objects are stored as Exchange properties between
+different Metrics component calls.
+
+[[MetricsComponent-Headers.4]]
+Headers
++++++++
+
+Message header can be used to override action value specified in Metrics
+component URI.
+
+[width="100%",cols="10%,80%,10%",options="header",]
+|=======================================================================
+|Name |Description |Expected type
+|CamelMetricsTimerAction |Override timer action in URI
+|`org.apache.camel.component.metrics.timer.TimerEndpoint.TimerAction`
+|=======================================================================
+
+[source,java]
+----
+// sets timer action using header
+from("direct:in")
+    .setHeader(MetricsConstants.HEADER_TIMER_ACTION, TimerAction.start)
+    .to("metric:timer:simple.timer")
+    .to("direct:out");
+----
+
+[[MetricsComponent-MetricsRoutePolicyFactory]]
+MetricsRoutePolicyFactory
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This factory allows to add a�link:routepolicy.html[RoutePolicy] for each
+route which exposes route utilization statistics using Dropwizard metrics.
+This factory can be used in Java and XML as the examples below
+demonstrates.�
+
+NOTE: Instead of using the MetricsRoutePolicyFactory you can define a
+MetricsRoutePolicy per route you want to instrument, in case you only
+want to instrument a few selected routes.
+
+From Java you just add the factory to the�`CamelContext` as shown below:
+
+[source,java]
+----
+context.addRoutePolicyFactory(new MetricsRoutePolicyFactory());
+----
+
+And from XML DSL you define a <bean> as follows:
+
+[source,xml]
+----
+  <!-- use camel-metrics route policy to gather metrics for all routes -->
+  <bean id="metricsRoutePolicyFactory" class="org.apache.camel.component.metrics.routepolicy.MetricsRoutePolicyFactory"/>
+----
+
+The�`MetricsRoutePolicyFactory` and�`MetricsRoutePolicy` supports the
+following options:
+
+[width="100%",cols="10%,10%,80%",options="header",]
+|=======================================================================
+|Name |Default |Description
+|useJmx |false |Whether to report fine grained statistics to JMX by
+using the `com.codahale.metrics.JmxReporter`. +
+Notice that if JMX is enabled on link:camelcontext.html[CamelContext]
+then a `MetricsRegistryService` mbean is enlisted under the services
+type in the JMX tree. That mbean has a single operation to output the
+statistics using json. Setting `useJmx` to true is only needed if you
+want fine grained mbeans per statistics type.
+
+|jmxDomain |org.apache.camel.metrics |The JMX domain name
+
+|prettyPrint |false |Whether to use pretty print when outputting
+statistics in json format
+
+|metricsRegistry |� |Allow to use a shared
+`com.codahale.metrics.MetricRegistry`. If none is provided then Camel
+will create a shared instance used by the this CamelContext.
+
+|rateUnit |TimeUnit.SECONDS |The unit to use for rate in the metrics
+reporter or when dumping the statistics as json.
+
+|durationUnit |TimeUnit.MILLISECONDS |The unit to use for duration in
+the metrics reporter or when dumping the statistics as json.
+
+|namePattern |`##name##.##routeId##.##type##` |*Camel 2.17:* The name
+pattern to use. Uses dot as separators, but you can change that. The
+values `##name##`, `##routeId##`, and `##type##` will be replaced with actual
+value. Where `###name###` is the name of the CamelContext. `###routeId###`
+is the name of the route. And `###type###` is the value of responses.
+|=======================================================================
+
+�
+
+From Java code tou can get hold of
+the�`com.codahale.metrics.MetricRegistry`�from the
+`org.apache.camel.component.metrics.routepolicy.MetricsRegistryService`
+as shown below:
+
+[source,java]
+----
+MetricRegistryService registryService = context.hasService(MetricsRegistryService.class);
+if (registryService != null) {
+  MetricsRegistry registry = registryService.getMetricsRegistry();
+  ...
+}
+----
+
+[[MetricsComponent-MetricsMessageHistoryFactory]]
+MetricsMessageHistoryFactory
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*Available as of Camel 2.17*
+
+This factory allows to use metrics to
+capture�link:message-history.html[Message History] performance
+statistics while routing messages. It works by using a metrics Timer for
+each node in all the routes.�This factory can be used in Java and XML as
+the examples below demonstrates.�
+
+From Java you just set the factory to the�`CamelContext`�as shown below:
+
+[source,java]
+----
+context.setMessageHistoryFactory(new MetricsMessageHistoryFactory());
+----
+
+And from XML DSL you define a <bean> as follows:
+
+[source,xml]
+----
+  <!-- use camel-metrics message history to gather metrics for all messages being routed -->
+  <bean id="metricsMessageHistoryFactory" class="org.apache.camel.component.metrics.messagehistory.MetricsMessageHistoryFactory"/>
+----
+
+The following options is supported on the factory:
+
+[width="100%",cols="10%,10%,80%",options="header",]
+|=======================================================================
+|Name |Default |Description
+|useJmx |false |Whether to report fine grained statistics to JMX by
+using the `com.codahale.metrics.JmxReporter`. +
+Notice that if JMX is enabled on link:camelcontext.html[CamelContext]
+then a `MetricsRegistryService` mbean is enlisted under the services
+type in the JMX tree. That mbean has a single operation to output the
+statistics using json. Setting `useJmx` to true is only needed if you
+want fine grained mbeans per statistics type.
+
+|jmxDomain |org.apache.camel.metrics |The JMX domain name
+
+|prettyPrint |false |Whether to use pretty print when outputting
+statistics in json format
+
+|metricsRegistry |� |Allow to use a shared
+`com.codahale.metrics.MetricRegistry`. If none is provided then Camel
+will create a shared instance used by the this CamelContext.
+
+|rateUnit |TimeUnit.SECONDS |The unit to use for rate in the metrics
+reporter or when dumping the statistics as json.
+
+|durationUnit |TimeUnit.MILLISECONDS |The unit to use for duration in
+the metrics reporter or when dumping the statistics as json.
+
+|namePattern |`##name##.##routeId##.###id###.##type##` |The name pattern
+to use. Uses dot as separators, but you can change that. The values
+`##name##`, `##routeId##`, `##type##`, and `###id###` will be replaced with
+actual value. Where `###name###` is the name of the CamelContext.
+`###routeId###` is the name of the route. The `###id###` pattern represents
+the node id. And `###type###` is the value of history.
+|=======================================================================
+
+At runtime the metrics can be accessed from Java API or JMX which allows
+to gather the data as json output.
+
+From Java code you can do get the service from the CamelContext as
+shown:
+
+[source,java]
+----
+MetricsMessageHistoryService service = context.hasService(MetricsMessageHistoryService.class);
+String json = service.dumpStatisticsAsJson();
+----
+
+And the JMX API the MBean is registered in the�`type=services` tree
+with�`name=MetricsMessageHistoryService`.
+
+[[MetricsComponent-SeeAlso]]
+See Also
+^^^^^^^^
+
+* The `camel-example-cdi-metrics` example that illustrates the integration
+  between Camel, Metrics and CDI.

http://git-wip-us.apache.org/repos/asf/camel/blob/9c0b7baf/components/camel-metrics/src/main/docs/metrics.adoc
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/main/docs/metrics.adoc b/components/camel-metrics/src/main/docs/metrics.adoc
deleted file mode 100644
index b05f500..0000000
--- a/components/camel-metrics/src/main/docs/metrics.adoc
+++ /dev/null
@@ -1,569 +0,0 @@
-ifdef::env-github[]
-:caution-caption: :boom:
-:important-caption: :exclamation:
-:note-caption: :information_source:
-:tip-caption: :bulb:
-:warning-caption: :warning:
-endif::[]
-
-[[MetricsComponent-MetricsComponent]]
-Metrics Component
-~~~~~~~~~~~~~~~~~
-
-*Available as of Camel 2.14*
-
-The�**metrics:**�component allows to collect various metrics directly
-from Camel routes. Supported metric types
-are�link:#MetricsComponent-counter[counter],�link:#MetricsComponent-histogram[histogram],
-link:#MetricsComponent-meter[meter]�and�link:#MetricsComponent-timer[timer].�http://metrics.dropwizard.io[Metrics]�provides
-simple way to measure behaviour of application. Configurable
-reporting�backend�is enabling different integration options for
-collecting and visualizing statistics. The component also provides
-a�`MetricsRoutePolicyFactory` which allows to expose route statistics
-using Dropwizard Metrics, see bottom of page for details.
-
-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-metrics</artifactId>
-    <version>x.x.x</version>
-    <!-- use the same version as your Camel core version -->
-</dependency>
-----
-
-[[MetricsComponent-URIformat]]
-URI format
-^^^^^^^^^^
-
-[source]
-----
-metrics:[ meter | counter | histogram | timer ]:metricname[?options]
-----
-
-[[MetricsComponent-registryMetricRegistry]]
-[[MetricsComponent-registry]]Metric Registry
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Camel Metrics component uses by default a `MetricRegistry` instance with
-a `Slf4jReporter` that has a 60 second reporting interval.
-This default registry can be replaced with a custom one by providing
-a `MetricRegistry` bean. If multiple `MetricRegistry` beans exist in the
-application, the one with name `metricRegistry` is used.
-
-For example using Spring Java Configuration:
-
-[source,java]
-----
-@Configuration
-public static class MyConfig extends SingleRouteCamelConfiguration {
-
-    @Bean
-    @Override
-    public RouteBuilder route() {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                // define Camel routes here
-            }
-        };
-    }
-
-    @Bean(name = MetricsComponent.METRIC_REGISTRY_NAME)
-    public MetricRegistry getMetricRegistry() {
-        MetricRegistry registry = ...;
-        return registry;
-    }
-}
-----
-
-Or using CDI:
-[source,java]
-----
-class MyBean extends RouteBuilder {
-
-    @Override
-    public void configure() {
-      from("...")
-          // Register the 'my-meter' meter in the MetricRegistry below
-          .to("metrics:meter:my-meter");
-    }
-
-    @Produces
-    // If multiple MetricRegistry beans
-    // @Named(MetricsComponent.METRIC_REGISTRY_NAME)
-    MetricRegistry registry() {
-        MetricRegistry registry = new MetricRegistry();
-        // ...
-        return registry;
-    }
-}
-----
-
-CAUTION: `MetricRegistry` uses internal thread(s) for reporting. There is no
-public API in version `3.0.1` for users to clean up on exit. Thus using
-Camel Metrics Component leads to Java classloader leak and my cause
-`OutOfMemoryErrors` in some cases.
-
-[[MetricsComponent-Usage]]
-Usage
-^^^^^
-
-Each metric has type and name. Supported types are
-link:#MetricsComponent-counter[counter],
-link:#MetricsComponent-histogram[histogram],�link:#MetricsComponent-meter[meter]�and
-link:#MetricsComponent-timer[timer]. Metric name is simple string. If
-metric type is not provided then type meter is used by default.
-
-[[MetricsComponent-Headers]]
-Headers
-+++++++
-
-Metric name defined in URI can be overridden by using header with name
-`CamelMetricsName`.
-
-For example
-
-[source,java]
-----
-from("direct:in")
-    .setHeader(MetricsConstants.HEADER_METRIC_NAME, constant("new.name"))
-    .to("metrics:counter:name.not.used")
-    .to("direct:out");
-----
-
-will update counter with name `new.name` instead of `name.not.used`.
-
-All Metrics specific headers are removed from the message once Metrics
-endpoint finishes processing of exchange. While processing exchange
-Metrics endpoint will catch all exceptions and write log entry using
-level `warn`.
-
-[[MetricsComponent-counterMetricstypecounter]]
-[[MetricsComponent-counter]]Metrics type counter
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-[source]
-----
-metrics:counter:metricname[?options]
-----
-
-[[MetricsComponent-Options]]
-Options
-+++++++
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|=====================================================
-|Name |Default |Description
-|increment� |- |Long value to add to the counter
-|decrement |- |Long value to subtract from the counter
-|=====================================================
-
-If neither `increment` or `decrement` is defined then counter value will
-be incremented by one. If `increment` and `decrement` are both defined
-only increment operation is called.�
-
-[source,java]
-----
-// update counter simple.counter by 7
-from("direct:in")
-    .to("metric:counter:simple.counter?increment=7")
-    .to("direct:out");
-----
-
-[source,java]
-----
-// increment counter simple.counter by 1
-from("direct:in")
-    .to("metric:counter:simple.counter")
-    .to("direct:out");
-----
-
-[source,java]
-----
-// decrement counter simple.counter by 3
-from("direct:in")
-    .to("metric:counter:simple.counter?decrement=3")
-    .to("direct:out");
-----
-
-[[MetricsComponent-Headers.1]]
-Headers
-+++++++
-
-Message headers can be used to override `increment` and `decrement`
-values specified in Metrics component URI.
-
-[width="100%",cols="10%,80%,10%",options="header",]
-|====================================================================
-|Name |Description |Expected type
-|CamelMetricsCounterIncrement� |Override increment value in URI |Long
-|CamelMetricsCounterDecrement� |Override decrement value in URI |Long
-|====================================================================
-
-[source,java]
-----
-// update counter simple.counter by 417
-from("direct:in")
-    .setHeader(MetricsConstants.HEADER_COUNTER_INCREMENT, constant(417L))
-    .to("metric:counter:simple.counter?increment=7")
-    .to("direct:out");
-----
-
-[source,java]
-----
-// updates counter using simple language to evaluate body.length
-from("direct:in")
-    .setHeader(MetricsConstants.HEADER_COUNTER_INCREMENT, simple("${body.length}"))
-    .to("metrics:counter:body.length")
-    .to("mock:out");
-
-----
-
-[[MetricsComponent-histogramMetrictypehistogram]]
-[[MetricsComponent-histogram]]Metric type histogram
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-[source]
-----
-metrics:histogram:metricname[?options]
-----
-
-[[MetricsComponent-Options.1]]
-Options
-+++++++
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|===================================
-|Name |Default |Description
-|value |- |Value to use in histogram
-|===================================
-
-If no `value` is not set nothing is added to histogram and warning is
-logged.
-
-[source,java]
-----
-// adds value 9923 to simple.histogram
-from("direct:in")
-    .to("metric:histogram:simple.histogram?value=9923")
-    .to("direct:out");
-----
-
-[source,java]
-----
-// nothing is added to simple.histogram; warning is logged
-from("direct:in")
-    .to("metric:histogram:simple.histogram")
-    .to("direct:out");
-
-----
-
-[[MetricsComponent-Headers.2]]
-Headers
-+++++++
-
-Message header can be used to override value specified in Metrics
-component URI.
-
-[width="100%",cols="10%,80%,10%",options="header",]
-|=================================================================
-|Name |Description |Expected type
-|CamelMetricsHistogramValue |Override histogram value in URI |Long
-|=================================================================
-
-[source,java]
-----
-// adds value 992 to simple.histogram
-from("direct:in")
-    .setHeader(MetricsConstants.HEADER_HISTOGRAM_VALUE, constant(992L))
-    .to("metric:histogram:simple.histogram?value=700")
-    .to("direct:out")
-
-----
-
-[[MetricsComponent-meterMetrictypemeter]]
-[[MetricsComponent-meter]]Metric type meter
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-[source]
-----
-metrics:meter:metricname[?options]
-----
-
-[[MetricsComponent-Options.2]]
-Options
-+++++++
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|===================================
-|Name |Default |Description
-|mark� |- |Long value to use as mark
-|===================================
-
-If `mark` is not set then�`meter.mark()` is called without argument.
-
-[source,java]
-----
-// marks simple.meter without value
-from("direct:in")
-    .to("metric:simple.meter")
-    .to("direct:out");
-----
-
-[source,java]
-----
-// marks simple.meter with value 81
-from("direct:in")
-    .to("metric:meter:simple.meter?mark=81")
-    .to("direct:out");
-----
-
-[[MetricsComponent-Headers.3]]
-Headers
-+++++++
-
-Message header can be used to override `mark` value specified in Metrics
-component URI.
-
-[width="100%",cols="10%,80%,10%",options="header",]
-|=======================================================
-|Name |Description |Expected type
-|CamelMetricsMeterMark |Override mark value in URI |Long
-|=======================================================
-
-[source,java]
-----
-// updates meter simple.meter with value 345
-from("direct:in")
-    .setHeader(MetricsConstants.HEADER_METER_MARK, constant(345L))
-    .to("metric:meter:simple.meter?mark=123")
-    .to("direct:out");
-----
-
-[[MetricsComponent-timerMetricstypetimer]]
-[[MetricsComponent-timer]]Metrics type timer
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-[source]
-----
-metrics:timer:metricname[?options]
-----
-
-[[MetricsComponent-Options.3]]
-Options
-+++++++
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|==========================
-|Name |Default |Description
-|action |- |start or stop
-|==========================
-
-If no `action` or invalid value is provided then warning is logged
-without any timer update. If action `start` is called on already running
-timer or `stop` is called on not running timer then nothing is updated
-and warning is logged.
-
-[source,java]
-----
-// measure time taken by route "calculate"
-from("direct:in")
-    .to("metrics:timer:simple.timer?action=start")
-    .to("direct:calculate")
-    .to("metrics:timer:simple.timer?action=stop");
-----
-
-`TimerContext` objects are stored as Exchange properties between
-different Metrics component calls.
-
-[[MetricsComponent-Headers.4]]
-Headers
-+++++++
-
-Message header can be used to override action value specified in Metrics
-component URI.
-
-[width="100%",cols="10%,80%,10%",options="header",]
-|=======================================================================
-|Name |Description |Expected type
-|CamelMetricsTimerAction |Override timer action in URI
-|`org.apache.camel.component.metrics.timer.TimerEndpoint.TimerAction`
-|=======================================================================
-
-[source,java]
-----
-// sets timer action using header
-from("direct:in")
-    .setHeader(MetricsConstants.HEADER_TIMER_ACTION, TimerAction.start)
-    .to("metric:timer:simple.timer")
-    .to("direct:out");
-----
-
-[[MetricsComponent-MetricsRoutePolicyFactory]]
-MetricsRoutePolicyFactory
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This factory allows to add a�link:routepolicy.html[RoutePolicy] for each
-route which exposes route utilization statistics using Dropwizard metrics.
-This factory can be used in Java and XML as the examples below
-demonstrates.�
-
-NOTE: Instead of using the MetricsRoutePolicyFactory you can define a
-MetricsRoutePolicy per route you want to instrument, in case you only
-want to instrument a few selected routes.
-
-From Java you just add the factory to the�`CamelContext` as shown below:
-
-[source,java]
-----
-context.addRoutePolicyFactory(new MetricsRoutePolicyFactory());
-----
-
-And from XML DSL you define a <bean> as follows:
-
-[source,xml]
-----
-  <!-- use camel-metrics route policy to gather metrics for all routes -->
-  <bean id="metricsRoutePolicyFactory" class="org.apache.camel.component.metrics.routepolicy.MetricsRoutePolicyFactory"/>
-----
-
-The�`MetricsRoutePolicyFactory` and�`MetricsRoutePolicy` supports the
-following options:
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Name |Default |Description
-|useJmx |false |Whether to report fine grained statistics to JMX by
-using the `com.codahale.metrics.JmxReporter`. +
-Notice that if JMX is enabled on link:camelcontext.html[CamelContext]
-then a `MetricsRegistryService` mbean is enlisted under the services
-type in the JMX tree. That mbean has a single operation to output the
-statistics using json. Setting `useJmx` to true is only needed if you
-want fine grained mbeans per statistics type.
-
-|jmxDomain |org.apache.camel.metrics |The JMX domain name
-
-|prettyPrint |false |Whether to use pretty print when outputting
-statistics in json format
-
-|metricsRegistry |� |Allow to use a shared
-`com.codahale.metrics.MetricRegistry`. If none is provided then Camel
-will create a shared instance used by the this CamelContext.
-
-|rateUnit |TimeUnit.SECONDS |The unit to use for rate in the metrics
-reporter or when dumping the statistics as json.
-
-|durationUnit |TimeUnit.MILLISECONDS |The unit to use for duration in
-the metrics reporter or when dumping the statistics as json.
-
-|namePattern |`##name##.##routeId##.##type##` |*Camel 2.17:* The name
-pattern to use. Uses dot as separators, but you can change that. The
-values `##name##`, `##routeId##`, and `##type##` will be replaced with actual
-value. Where `###name###` is the name of the CamelContext. `###routeId###`
-is the name of the route. And `###type###` is the value of responses.
-|=======================================================================
-
-�
-
-From Java code tou can get hold of
-the�`com.codahale.metrics.MetricRegistry`�from the
-`org.apache.camel.component.metrics.routepolicy.MetricsRegistryService`
-as shown below:
-
-[source,java]
-----
-MetricRegistryService registryService = context.hasService(MetricsRegistryService.class);
-if (registryService != null) {
-  MetricsRegistry registry = registryService.getMetricsRegistry();
-  ...
-}
-----
-
-[[MetricsComponent-MetricsMessageHistoryFactory]]
-MetricsMessageHistoryFactory
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-*Available as of Camel 2.17*
-
-This factory allows to use metrics to
-capture�link:message-history.html[Message History] performance
-statistics while routing messages. It works by using a metrics Timer for
-each node in all the routes.�This factory can be used in Java and XML as
-the examples below demonstrates.�
-
-From Java you just set the factory to the�`CamelContext`�as shown below:
-
-[source,java]
-----
-context.setMessageHistoryFactory(new MetricsMessageHistoryFactory());
-----
-
-And from XML DSL you define a <bean> as follows:
-
-[source,xml]
-----
-  <!-- use camel-metrics message history to gather metrics for all messages being routed -->
-  <bean id="metricsMessageHistoryFactory" class="org.apache.camel.component.metrics.messagehistory.MetricsMessageHistoryFactory"/>
-----
-
-The following options is supported on the factory:
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Name |Default |Description
-|useJmx |false |Whether to report fine grained statistics to JMX by
-using the `com.codahale.metrics.JmxReporter`. +
-Notice that if JMX is enabled on link:camelcontext.html[CamelContext]
-then a `MetricsRegistryService` mbean is enlisted under the services
-type in the JMX tree. That mbean has a single operation to output the
-statistics using json. Setting `useJmx` to true is only needed if you
-want fine grained mbeans per statistics type.
-
-|jmxDomain |org.apache.camel.metrics |The JMX domain name
-
-|prettyPrint |false |Whether to use pretty print when outputting
-statistics in json format
-
-|metricsRegistry |� |Allow to use a shared
-`com.codahale.metrics.MetricRegistry`. If none is provided then Camel
-will create a shared instance used by the this CamelContext.
-
-|rateUnit |TimeUnit.SECONDS |The unit to use for rate in the metrics
-reporter or when dumping the statistics as json.
-
-|durationUnit |TimeUnit.MILLISECONDS |The unit to use for duration in
-the metrics reporter or when dumping the statistics as json.
-
-|namePattern |`##name##.##routeId##.###id###.##type##` |The name pattern
-to use. Uses dot as separators, but you can change that. The values
-`##name##`, `##routeId##`, `##type##`, and `###id###` will be replaced with
-actual value. Where `###name###` is the name of the CamelContext.
-`###routeId###` is the name of the route. The `###id###` pattern represents
-the node id. And `###type###` is the value of history.
-|=======================================================================
-
-At runtime the metrics can be accessed from Java API or JMX which allows
-to gather the data as json output.
-
-From Java code you can do get the service from the CamelContext as
-shown:
-
-[source,java]
-----
-MetricsMessageHistoryService service = context.hasService(MetricsMessageHistoryService.class);
-String json = service.dumpStatisticsAsJson();
-----
-
-And the JMX API the MBean is registered in the�`type=services` tree
-with�`name=MetricsMessageHistoryService`.
-
-[[MetricsComponent-SeeAlso]]
-See Also
-^^^^^^^^
-
-* The `camel-example-cdi-metrics` example that illustrates the integration
-  between Camel, Metrics and CDI.

http://git-wip-us.apache.org/repos/asf/camel/blob/9c0b7baf/components/camel-mina/src/main/docs/mina-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-mina/src/main/docs/mina-component.adoc b/components/camel-mina/src/main/docs/mina-component.adoc
new file mode 100644
index 0000000..3feb59c
--- /dev/null
+++ b/components/camel-mina/src/main/docs/mina-component.adoc
@@ -0,0 +1,368 @@
+[[MINA-MINAComponent]]
+MINA Component
+~~~~~~~~~~~~~~
+
+*Deprecated*
+
+WARNING: This component is deprecated as the Apache Mina 1.x project is EOL.
+Instead use link:mina2.html[MINA2] or link:netty.html[Netty] instead.
+
+The *mina:* component is a transport for working with
+http://mina.apache.org/[Apache MINA]
+
+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-mina</artifactId>
+    <version>x.x.x</version>
+    <!-- use the same version as your Camel core version -->
+</dependency>
+------------------------------------------------------------
+
+[[MINA-URIformat]]
+URI format
+^^^^^^^^^^
+
+[source,java]
+------------------------------------
+mina:tcp://hostname[:port][?options]
+mina:udp://hostname[:port][?options]
+mina:vm://hostname[:port][?options]
+------------------------------------
+
+You can specify a codec in the link:registry.html[Registry] using the
+*codec* option. If you are using TCP and no codec is specified then the
+`textline` flag is used to determine if text line based codec or object
+serialization should be used instead. By default the object
+serialization is used.
+
+For UDP if no codec is specified the default uses a basic `ByteBuffer`
+based codec.
+
+The VM protocol is used as a direct forwarding mechanism in the same
+JVM. See the
+http://mina.apache.org/report/1.1/apidocs/org/apache/mina/transport/vmpipe/package-summary.html[MINA
+VM-Pipe API documentation] for details.
+
+A Mina producer has a default timeout value of 30 seconds, while it
+waits for a response from the remote server.
+
+In normal use, `camel-mina` only supports marshalling the body
+content\u2014message headers and exchange properties are not sent. +
+ However, the option, *transferExchange*, does allow you to transfer the
+exchange itself over the wire. See options below.
+
+You can append query options to the URI in the following format,
+`?option=value&option=value&...`
+
+[[MINA-Options]]
+Options
+^^^^^^^
+
+
+
+
+// component options: START
+The Mina component supports 21 options which are listed below.
+
+
+
+{% raw %}
+[width="100%",cols="2s,1m,8",options="header"]
+|=======================================================================
+| Name | Java Type | Description
+| configuration | MinaConfiguration | To use the shared mina configuration. Properties of the shared configuration can also be set individually.
+| protocol | String | Protocol to use
+| host | String | Hostname to use. Use localhost or 0.0.0.0 for local server as consumer. For producer use the hostname or ip address of the remote server.
+| port | int | Port number
+| sync | boolean | Setting to set endpoint as one-way or request-response.
+| textline | boolean | Only used for TCP. If no codec is specified you can use this flag to indicate a text line based codec; if not specified or the value is false then Object Serialization is assumed over TCP.
+| textlineDelimiter | TextLineDelimiter | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided Camel will use DEFAULT. This delimiter is used to mark the end of text.
+| codec | ProtocolCodecFactory | To use a custom minda codec implementation.
+| encoding | String | You can configure the encoding (a charset name) to use for the TCP textline codec and the UDP protocol. If not provided Camel will use the JVM default Charset
+| timeout | long | You can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds so 60000 is 60 seconds.
+| lazySessionCreation | boolean | Sessions can be lazily created to avoid exceptions if the remote server is not up and running when the Camel producer is started.
+| transferExchange | boolean | Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body Out body fault body In headers Out headers fault headers exchange properties exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level.
+| encoderMaxLineLength | int | To set the textline protocol encoder max line length. By default the default value of Mina itself is used which are Integer.MAX_VALUE.
+| decoderMaxLineLength | int | To set the textline protocol decoder max line length. By default the default value of Mina itself is used which are 1024.
+| minaLogger | boolean | You can enable the Apache MINA logging filter. Apache MINA uses slf4j logging at INFO level to log all input and output.
+| filters | List | You can set a list of Mina IoFilters to use.
+| allowDefaultCodec | boolean | The mina component installs a default codec if both codec is null and textline is false. Setting allowDefaultCodec to false prevents the mina component from installing a default codec as the first element in the filter chain. This is useful in scenarios where another filter must be the first in the filter chain like the SSL filter.
+| disconnect | boolean | Whether or not to disconnect(close) from Mina session right after use. Can be used for both consumer and producer.
+| disconnectOnNoReply | boolean | If sync is enabled then this option dictates MinaConsumer if it should disconnect where there is no reply to send back.
+| noReplyLogLevel | LoggingLevel | If sync is enabled this option dictates MinaConsumer which logging level to use when logging a there is no reply to send back.
+| clientMode | boolean | If the clientMode is true mina consumer will connect the address as a TCP client.
+|=======================================================================
+{% endraw %}
+// component options: END
+
+
+
+
+
+
+
+// endpoint options: START
+The Mina component supports 24 endpoint options which are listed below:
+
+{% raw %}
+[width="100%",cols="2s,1,1m,1m,5",options="header"]
+|=======================================================================
+| Name | Group | Default | Java Type | Description
+| protocol | common |  | String | *Required* Protocol to use
+| host | common |  | String | *Required* Hostname to use. Use localhost or 0.0.0.0 for local server as consumer. For producer use the hostname or ip address of the remote server.
+| port | common |  | int | *Required* Port number
+| disconnect | common | false | boolean | Whether or not to disconnect(close) from Mina session right after use. Can be used for both consumer and producer.
+| minaLogger | common | false | boolean | You can enable the Apache MINA logging filter. Apache MINA uses slf4j logging at INFO level to log all input and output.
+| sync | common | true | boolean | Setting to set endpoint as one-way or request-response.
+| timeout | common | 30000 | long | You can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds so 60000 is 60 seconds.
+| 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.
+| clientMode | consumer | false | boolean | If the clientMode is true mina consumer will connect the address as a TCP client.
+| disconnectOnNoReply | consumer (advanced) | true | boolean | If sync is enabled then this option dictates MinaConsumer if it should disconnect where there is no reply to send back.
+| 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.
+| noReplyLogLevel | consumer (advanced) | WARN | LoggingLevel | If sync is enabled this option dictates MinaConsumer which logging level to use when logging a there is no reply to send back.
+| lazySessionCreation | producer (advanced) | true | boolean | Sessions can be lazily created to avoid exceptions if the remote server is not up and running when the Camel producer is started.
+| 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).
+| transferExchange | advanced | false | boolean | Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body Out body fault body In headers Out headers fault headers exchange properties exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level.
+| allowDefaultCodec | codec | true | boolean | The mina component installs a default codec if both codec is null and textline is false. Setting allowDefaultCodec to false prevents the mina component from installing a default codec as the first element in the filter chain. This is useful in scenarios where another filter must be the first in the filter chain like the SSL filter.
+| codec | codec |  | ProtocolCodecFactory | To use a custom minda codec implementation.
+| decoderMaxLineLength | codec | 1024 | int | To set the textline protocol decoder max line length. By default the default value of Mina itself is used which are 1024.
+| encoderMaxLineLength | codec | -1 | int | To set the textline protocol encoder max line length. By default the default value of Mina itself is used which are Integer.MAX_VALUE.
+| encoding | codec |  | String | You can configure the encoding (a charset name) to use for the TCP textline codec and the UDP protocol. If not provided Camel will use the JVM default Charset
+| filters | codec |  | List | You can set a list of Mina IoFilters to use.
+| textline | codec | false | boolean | Only used for TCP. If no codec is specified you can use this flag to indicate a text line based codec; if not specified or the value is false then Object Serialization is assumed over TCP.
+| textlineDelimiter | codec |  | TextLineDelimiter | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided Camel will use DEFAULT. This delimiter is used to mark the end of text.
+|=======================================================================
+{% endraw %}
+// endpoint options: END
+
+
+
+
+[[MINA-Usingacustomcodec]]
+Using a custom codec
+^^^^^^^^^^^^^^^^^^^^
+
+See the http://mina.apache.org/tutorial-on-protocolcodecfilter.html[Mina
+documentation] how to write your own codec. To use your custom codec
+with `camel-mina`, you should register your codec in the
+link:registry.html[Registry]; for example, by creating a bean in the
+Spring XML file. Then use the `codec` option to specify the bean ID of
+your codec. See link:hl7.html[HL7] that has a custom codec.
+
+[[MINA-Samplewithsync=false]]
+Sample with sync=false
+^^^^^^^^^^^^^^^^^^^^^^
+
+In this sample, Camel exposes a service that listens for TCP connections
+on port 6200. We use the *textline* codec. In our route, we create a
+Mina consumer endpoint that listens on port 6200:
+
+As the sample is part of a unit test, we test it by sending some data to
+it on port 6200.
+
+[[MINA-Samplewithsync=true]]
+Sample with sync=true
+^^^^^^^^^^^^^^^^^^^^^
+
+In the next sample, we have a more common use case where we expose a TCP
+service on port 6201 also use the textline codec. However, this time we
+want to return a response, so we set the `sync` option to `true` on the
+consumer.
+
+Then we test the sample by sending some data and retrieving the response
+using the `template.requestBody()` method. As we know the response is a
+`String`, we cast it to `String` and can assert that the response is, in
+fact, something we have dynamically set in our processor code logic.
+
+[[MINA-SamplewithSpringDSL]]
+Sample with Spring DSL
+^^^^^^^^^^^^^^^^^^^^^^
+
+Spring DSL can, of course, also be used for link:mina.html[MINA]. In the
+sample below we expose a TCP server on port 5555:
+
+[source,xml]
+----------------------------------------------------------
+   <route>
+     <from uri="mina:tcp://localhost:5555?textline=true"/>
+     <to uri="bean:myTCPOrderHandler"/>
+  </route>
+----------------------------------------------------------
+
+In the route above, we expose a TCP server on port 5555 using the
+textline codec. We let the Spring bean with ID, `myTCPOrderHandler`,
+handle the request and return a reply. For instance, the handler bean
+could be implemented as follows:
+
+[source,java]
+-----------------------------------------------
+    public String handleOrder(String payload) {
+        ...
+        return "Order: OK"
+   }
+-----------------------------------------------
+
+[[MINA-ConfiguringMinaendpointsusingSpringbeanstyle]]
+Configuring Mina endpoints using Spring bean style
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Configuration of Mina endpoints is possible using regular Spring bean
+style configuration in the Spring DSL.
+
+However, in the underlying Apache Mina toolkit, it is relatively
+difficult to set up the acceptor and the connector, because you can
+_not_ use simple setters. To resolve this difficulty, we leverage the
+`MinaComponent` as a Spring factory bean to configure this for us. If
+you really need to configure this yourself, there are setters on the
+`MinaEndpoint` to set these when needed.
+
+The sample below shows the factory approach:
+
+And then we can refer to our endpoint directly in the route, as follows:
+
+[[MINA-ClosingSessionWhenComplete]]
+Closing Session When Complete
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When acting as a server you sometimes want to close the session when,
+for example, a client conversion is finished. To instruct Camel to close
+the session, you should add a header with the key
+`CamelMinaCloseSessionWhenComplete` set to a boolean `true` value.
+
+For instance, the example below will close the session after it has
+written the `bye` message back to the client:
+
+[source,java]
+--------------------------------------------------------------------------------------------------
+        from("mina:tcp://localhost:8080?sync=true&textline=true").process(new Processor() {
+            public void process(Exchange exchange) throws Exception {
+                String body = exchange.getIn().getBody(String.class);
+                exchange.getOut().setBody("Bye " + body);
+                exchange.getOut().setHeader(MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE, true);
+            }
+        });
+--------------------------------------------------------------------------------------------------
+
+[[MINA-GettheIoSessionformessage]]
+Get the IoSession for message
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*Available since Camel 2.1* 
+You can get the IoSession from the message header with this key
+MinaEndpoint.HEADER_MINA_IOSESSION, and also get the local host address
+with the key MinaEndpoint.HEADER_LOCAL_ADDRESS and remote host address
+with the key MinaEndpoint.HEADER_REMOTE_ADDRESS.
+
+[[MINA-ConfiguringMinafilters]]
+Configuring Mina filters
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+Filters permit you to use some Mina Filters, such as `SslFilter`. You
+can also implement some customized filters. Please note that `codec` and
+`logger` are also implemented as Mina filters of type, `IoFilter`. Any
+filters you may define are appended to the end of the filter chain; that
+is, after `codec` and `logger`.
+
+TIP: If using the `SslFilter` you need to add the `mina-filter-ssl` JAR to
+the classpath.
+
+For instance, the example below will send a keep-alive message after 10
+seconds of inactivity:
+
+[source,java]
+------------------------------------------------------------------------
+public class KeepAliveFilter extends IoFilterAdapter {
+    @Override
+    public void sessionCreated(NextFilter nextFilter, IoSession session)
+            throws Exception {
+        session.setIdleTime(IdleStatus.BOTH_IDLE, 10);
+
+        nextFilter.sessionCreated(session);
+    }
+
+    @Override
+    public void sessionIdle(NextFilter nextFilter, IoSession session,
+            IdleStatus status) throws Exception {
+        session.write("NOOP"); // NOOP is a FTP command for keep alive
+        nextFilter.sessionIdle(session, status);
+    }
+}
+------------------------------------------------------------------------
+
+As Camel Mina may use a request-reply scheme, the endpoint as a client
+would like to drop some message, such as greeting when the connection is
+established. For example, when you connect to an FTP server, you will
+get a `220` message with a greeting (`220 Welcome to Pure-FTPd`). If you
+don't drop the message, your request-reply scheme will be broken.
+
+[source,java]
+--------------------------------------------------------------------------------------------------
+public class DropGreetingFilter extends IoFilterAdapter {
+
+    @Override
+    public void messageReceived(NextFilter nextFilter, IoSession session,
+            Object message) throws Exception {
+        if (message instanceof String) {
+            String ftpMessage = (String) message;
+            // "220" is given as greeting. "200 Zzz" is given as a response to "NOOP" (keep alive)
+            if (ftpMessage.startsWith("220") || or ftpMessage.startsWith("200 Zzz")) {
+                // Dropping greeting
+                return;
+            }
+        }
+        nextFilter.messageReceived(session, message);
+    }
+}
+--------------------------------------------------------------------------------------------------
+
+Then, you can configure your endpoint using Spring DSL:
+
+[source,xml]
+----------------------------------------------------------------------------------
+<bean id="myMinaFactory" class="org.apache.camel.component.mina.MinaComponent">
+    <constructor-arg index="0" ref="camelContext" />
+</bean>
+
+<bean id="myMinaEndpoint"
+      factory-bean="myMinaFactory"
+      factory-method="createEndpoint">
+    <constructor-arg index="0" ref="myMinaConfig"/>
+</bean>
+
+<bean id="myMinaConfig" class="org.apache.camel.component.mina.MinaConfiguration">
+    <property name="protocol" value="tcp" />
+    <property name="host" value="localhost" />
+    <property name="port" value="2121" />
+    <property name="sync" value="true" />
+    <property name="minaLogger" value="true" />
+    <property name="filters" ref="listFilters"/>
+</bean>
+
+<bean id="listFilters" class="java.util.ArrayList" >
+    <constructor-arg>
+        <list value-type="org.apache.mina.common.IoFilter">
+            <bean class="com.example.KeepAliveFilter"/>
+            <bean class="com.example.DropGreetingFilter"/>
+        </list>
+    </constructor-arg>
+</bean>
+----------------------------------------------------------------------------------
+
+[[MINA-SeeAlso]]
+See Also
+^^^^^^^^
+
+* link:configuring-camel.html[Configuring Camel]
+* link:component.html[Component]
+* link:endpoint.html[Endpoint]
+* link:getting-started.html[Getting Started]
+
+* link:mina2.html[MINA2]
+* link:netty.html[Netty]
+

http://git-wip-us.apache.org/repos/asf/camel/blob/9c0b7baf/components/camel-mina/src/main/docs/mina.adoc
----------------------------------------------------------------------
diff --git a/components/camel-mina/src/main/docs/mina.adoc b/components/camel-mina/src/main/docs/mina.adoc
deleted file mode 100644
index 3feb59c..0000000
--- a/components/camel-mina/src/main/docs/mina.adoc
+++ /dev/null
@@ -1,368 +0,0 @@
-[[MINA-MINAComponent]]
-MINA Component
-~~~~~~~~~~~~~~
-
-*Deprecated*
-
-WARNING: This component is deprecated as the Apache Mina 1.x project is EOL.
-Instead use link:mina2.html[MINA2] or link:netty.html[Netty] instead.
-
-The *mina:* component is a transport for working with
-http://mina.apache.org/[Apache MINA]
-
-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-mina</artifactId>
-    <version>x.x.x</version>
-    <!-- use the same version as your Camel core version -->
-</dependency>
-------------------------------------------------------------
-
-[[MINA-URIformat]]
-URI format
-^^^^^^^^^^
-
-[source,java]
-------------------------------------
-mina:tcp://hostname[:port][?options]
-mina:udp://hostname[:port][?options]
-mina:vm://hostname[:port][?options]
-------------------------------------
-
-You can specify a codec in the link:registry.html[Registry] using the
-*codec* option. If you are using TCP and no codec is specified then the
-`textline` flag is used to determine if text line based codec or object
-serialization should be used instead. By default the object
-serialization is used.
-
-For UDP if no codec is specified the default uses a basic `ByteBuffer`
-based codec.
-
-The VM protocol is used as a direct forwarding mechanism in the same
-JVM. See the
-http://mina.apache.org/report/1.1/apidocs/org/apache/mina/transport/vmpipe/package-summary.html[MINA
-VM-Pipe API documentation] for details.
-
-A Mina producer has a default timeout value of 30 seconds, while it
-waits for a response from the remote server.
-
-In normal use, `camel-mina` only supports marshalling the body
-content\u2014message headers and exchange properties are not sent. +
- However, the option, *transferExchange*, does allow you to transfer the
-exchange itself over the wire. See options below.
-
-You can append query options to the URI in the following format,
-`?option=value&option=value&...`
-
-[[MINA-Options]]
-Options
-^^^^^^^
-
-
-
-
-// component options: START
-The Mina component supports 21 options which are listed below.
-
-
-
-{% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
-|=======================================================================
-| Name | Java Type | Description
-| configuration | MinaConfiguration | To use the shared mina configuration. Properties of the shared configuration can also be set individually.
-| protocol | String | Protocol to use
-| host | String | Hostname to use. Use localhost or 0.0.0.0 for local server as consumer. For producer use the hostname or ip address of the remote server.
-| port | int | Port number
-| sync | boolean | Setting to set endpoint as one-way or request-response.
-| textline | boolean | Only used for TCP. If no codec is specified you can use this flag to indicate a text line based codec; if not specified or the value is false then Object Serialization is assumed over TCP.
-| textlineDelimiter | TextLineDelimiter | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided Camel will use DEFAULT. This delimiter is used to mark the end of text.
-| codec | ProtocolCodecFactory | To use a custom minda codec implementation.
-| encoding | String | You can configure the encoding (a charset name) to use for the TCP textline codec and the UDP protocol. If not provided Camel will use the JVM default Charset
-| timeout | long | You can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds so 60000 is 60 seconds.
-| lazySessionCreation | boolean | Sessions can be lazily created to avoid exceptions if the remote server is not up and running when the Camel producer is started.
-| transferExchange | boolean | Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body Out body fault body In headers Out headers fault headers exchange properties exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level.
-| encoderMaxLineLength | int | To set the textline protocol encoder max line length. By default the default value of Mina itself is used which are Integer.MAX_VALUE.
-| decoderMaxLineLength | int | To set the textline protocol decoder max line length. By default the default value of Mina itself is used which are 1024.
-| minaLogger | boolean | You can enable the Apache MINA logging filter. Apache MINA uses slf4j logging at INFO level to log all input and output.
-| filters | List | You can set a list of Mina IoFilters to use.
-| allowDefaultCodec | boolean | The mina component installs a default codec if both codec is null and textline is false. Setting allowDefaultCodec to false prevents the mina component from installing a default codec as the first element in the filter chain. This is useful in scenarios where another filter must be the first in the filter chain like the SSL filter.
-| disconnect | boolean | Whether or not to disconnect(close) from Mina session right after use. Can be used for both consumer and producer.
-| disconnectOnNoReply | boolean | If sync is enabled then this option dictates MinaConsumer if it should disconnect where there is no reply to send back.
-| noReplyLogLevel | LoggingLevel | If sync is enabled this option dictates MinaConsumer which logging level to use when logging a there is no reply to send back.
-| clientMode | boolean | If the clientMode is true mina consumer will connect the address as a TCP client.
-|=======================================================================
-{% endraw %}
-// component options: END
-
-
-
-
-
-
-
-// endpoint options: START
-The Mina component supports 24 endpoint options which are listed below:
-
-{% raw %}
-[width="100%",cols="2s,1,1m,1m,5",options="header"]
-|=======================================================================
-| Name | Group | Default | Java Type | Description
-| protocol | common |  | String | *Required* Protocol to use
-| host | common |  | String | *Required* Hostname to use. Use localhost or 0.0.0.0 for local server as consumer. For producer use the hostname or ip address of the remote server.
-| port | common |  | int | *Required* Port number
-| disconnect | common | false | boolean | Whether or not to disconnect(close) from Mina session right after use. Can be used for both consumer and producer.
-| minaLogger | common | false | boolean | You can enable the Apache MINA logging filter. Apache MINA uses slf4j logging at INFO level to log all input and output.
-| sync | common | true | boolean | Setting to set endpoint as one-way or request-response.
-| timeout | common | 30000 | long | You can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds so 60000 is 60 seconds.
-| 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.
-| clientMode | consumer | false | boolean | If the clientMode is true mina consumer will connect the address as a TCP client.
-| disconnectOnNoReply | consumer (advanced) | true | boolean | If sync is enabled then this option dictates MinaConsumer if it should disconnect where there is no reply to send back.
-| 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.
-| noReplyLogLevel | consumer (advanced) | WARN | LoggingLevel | If sync is enabled this option dictates MinaConsumer which logging level to use when logging a there is no reply to send back.
-| lazySessionCreation | producer (advanced) | true | boolean | Sessions can be lazily created to avoid exceptions if the remote server is not up and running when the Camel producer is started.
-| 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).
-| transferExchange | advanced | false | boolean | Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body Out body fault body In headers Out headers fault headers exchange properties exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level.
-| allowDefaultCodec | codec | true | boolean | The mina component installs a default codec if both codec is null and textline is false. Setting allowDefaultCodec to false prevents the mina component from installing a default codec as the first element in the filter chain. This is useful in scenarios where another filter must be the first in the filter chain like the SSL filter.
-| codec | codec |  | ProtocolCodecFactory | To use a custom minda codec implementation.
-| decoderMaxLineLength | codec | 1024 | int | To set the textline protocol decoder max line length. By default the default value of Mina itself is used which are 1024.
-| encoderMaxLineLength | codec | -1 | int | To set the textline protocol encoder max line length. By default the default value of Mina itself is used which are Integer.MAX_VALUE.
-| encoding | codec |  | String | You can configure the encoding (a charset name) to use for the TCP textline codec and the UDP protocol. If not provided Camel will use the JVM default Charset
-| filters | codec |  | List | You can set a list of Mina IoFilters to use.
-| textline | codec | false | boolean | Only used for TCP. If no codec is specified you can use this flag to indicate a text line based codec; if not specified or the value is false then Object Serialization is assumed over TCP.
-| textlineDelimiter | codec |  | TextLineDelimiter | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided Camel will use DEFAULT. This delimiter is used to mark the end of text.
-|=======================================================================
-{% endraw %}
-// endpoint options: END
-
-
-
-
-[[MINA-Usingacustomcodec]]
-Using a custom codec
-^^^^^^^^^^^^^^^^^^^^
-
-See the http://mina.apache.org/tutorial-on-protocolcodecfilter.html[Mina
-documentation] how to write your own codec. To use your custom codec
-with `camel-mina`, you should register your codec in the
-link:registry.html[Registry]; for example, by creating a bean in the
-Spring XML file. Then use the `codec` option to specify the bean ID of
-your codec. See link:hl7.html[HL7] that has a custom codec.
-
-[[MINA-Samplewithsync=false]]
-Sample with sync=false
-^^^^^^^^^^^^^^^^^^^^^^
-
-In this sample, Camel exposes a service that listens for TCP connections
-on port 6200. We use the *textline* codec. In our route, we create a
-Mina consumer endpoint that listens on port 6200:
-
-As the sample is part of a unit test, we test it by sending some data to
-it on port 6200.
-
-[[MINA-Samplewithsync=true]]
-Sample with sync=true
-^^^^^^^^^^^^^^^^^^^^^
-
-In the next sample, we have a more common use case where we expose a TCP
-service on port 6201 also use the textline codec. However, this time we
-want to return a response, so we set the `sync` option to `true` on the
-consumer.
-
-Then we test the sample by sending some data and retrieving the response
-using the `template.requestBody()` method. As we know the response is a
-`String`, we cast it to `String` and can assert that the response is, in
-fact, something we have dynamically set in our processor code logic.
-
-[[MINA-SamplewithSpringDSL]]
-Sample with Spring DSL
-^^^^^^^^^^^^^^^^^^^^^^
-
-Spring DSL can, of course, also be used for link:mina.html[MINA]. In the
-sample below we expose a TCP server on port 5555:
-
-[source,xml]
-----------------------------------------------------------
-   <route>
-     <from uri="mina:tcp://localhost:5555?textline=true"/>
-     <to uri="bean:myTCPOrderHandler"/>
-  </route>
-----------------------------------------------------------
-
-In the route above, we expose a TCP server on port 5555 using the
-textline codec. We let the Spring bean with ID, `myTCPOrderHandler`,
-handle the request and return a reply. For instance, the handler bean
-could be implemented as follows:
-
-[source,java]
------------------------------------------------
-    public String handleOrder(String payload) {
-        ...
-        return "Order: OK"
-   }
------------------------------------------------
-
-[[MINA-ConfiguringMinaendpointsusingSpringbeanstyle]]
-Configuring Mina endpoints using Spring bean style
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Configuration of Mina endpoints is possible using regular Spring bean
-style configuration in the Spring DSL.
-
-However, in the underlying Apache Mina toolkit, it is relatively
-difficult to set up the acceptor and the connector, because you can
-_not_ use simple setters. To resolve this difficulty, we leverage the
-`MinaComponent` as a Spring factory bean to configure this for us. If
-you really need to configure this yourself, there are setters on the
-`MinaEndpoint` to set these when needed.
-
-The sample below shows the factory approach:
-
-And then we can refer to our endpoint directly in the route, as follows:
-
-[[MINA-ClosingSessionWhenComplete]]
-Closing Session When Complete
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-When acting as a server you sometimes want to close the session when,
-for example, a client conversion is finished. To instruct Camel to close
-the session, you should add a header with the key
-`CamelMinaCloseSessionWhenComplete` set to a boolean `true` value.
-
-For instance, the example below will close the session after it has
-written the `bye` message back to the client:
-
-[source,java]
---------------------------------------------------------------------------------------------------
-        from("mina:tcp://localhost:8080?sync=true&textline=true").process(new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                String body = exchange.getIn().getBody(String.class);
-                exchange.getOut().setBody("Bye " + body);
-                exchange.getOut().setHeader(MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE, true);
-            }
-        });
---------------------------------------------------------------------------------------------------
-
-[[MINA-GettheIoSessionformessage]]
-Get the IoSession for message
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-*Available since Camel 2.1* 
-You can get the IoSession from the message header with this key
-MinaEndpoint.HEADER_MINA_IOSESSION, and also get the local host address
-with the key MinaEndpoint.HEADER_LOCAL_ADDRESS and remote host address
-with the key MinaEndpoint.HEADER_REMOTE_ADDRESS.
-
-[[MINA-ConfiguringMinafilters]]
-Configuring Mina filters
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-Filters permit you to use some Mina Filters, such as `SslFilter`. You
-can also implement some customized filters. Please note that `codec` and
-`logger` are also implemented as Mina filters of type, `IoFilter`. Any
-filters you may define are appended to the end of the filter chain; that
-is, after `codec` and `logger`.
-
-TIP: If using the `SslFilter` you need to add the `mina-filter-ssl` JAR to
-the classpath.
-
-For instance, the example below will send a keep-alive message after 10
-seconds of inactivity:
-
-[source,java]
-------------------------------------------------------------------------
-public class KeepAliveFilter extends IoFilterAdapter {
-    @Override
-    public void sessionCreated(NextFilter nextFilter, IoSession session)
-            throws Exception {
-        session.setIdleTime(IdleStatus.BOTH_IDLE, 10);
-
-        nextFilter.sessionCreated(session);
-    }
-
-    @Override
-    public void sessionIdle(NextFilter nextFilter, IoSession session,
-            IdleStatus status) throws Exception {
-        session.write("NOOP"); // NOOP is a FTP command for keep alive
-        nextFilter.sessionIdle(session, status);
-    }
-}
-------------------------------------------------------------------------
-
-As Camel Mina may use a request-reply scheme, the endpoint as a client
-would like to drop some message, such as greeting when the connection is
-established. For example, when you connect to an FTP server, you will
-get a `220` message with a greeting (`220 Welcome to Pure-FTPd`). If you
-don't drop the message, your request-reply scheme will be broken.
-
-[source,java]
---------------------------------------------------------------------------------------------------
-public class DropGreetingFilter extends IoFilterAdapter {
-
-    @Override
-    public void messageReceived(NextFilter nextFilter, IoSession session,
-            Object message) throws Exception {
-        if (message instanceof String) {
-            String ftpMessage = (String) message;
-            // "220" is given as greeting. "200 Zzz" is given as a response to "NOOP" (keep alive)
-            if (ftpMessage.startsWith("220") || or ftpMessage.startsWith("200 Zzz")) {
-                // Dropping greeting
-                return;
-            }
-        }
-        nextFilter.messageReceived(session, message);
-    }
-}
---------------------------------------------------------------------------------------------------
-
-Then, you can configure your endpoint using Spring DSL:
-
-[source,xml]
-----------------------------------------------------------------------------------
-<bean id="myMinaFactory" class="org.apache.camel.component.mina.MinaComponent">
-    <constructor-arg index="0" ref="camelContext" />
-</bean>
-
-<bean id="myMinaEndpoint"
-      factory-bean="myMinaFactory"
-      factory-method="createEndpoint">
-    <constructor-arg index="0" ref="myMinaConfig"/>
-</bean>
-
-<bean id="myMinaConfig" class="org.apache.camel.component.mina.MinaConfiguration">
-    <property name="protocol" value="tcp" />
-    <property name="host" value="localhost" />
-    <property name="port" value="2121" />
-    <property name="sync" value="true" />
-    <property name="minaLogger" value="true" />
-    <property name="filters" ref="listFilters"/>
-</bean>
-
-<bean id="listFilters" class="java.util.ArrayList" >
-    <constructor-arg>
-        <list value-type="org.apache.mina.common.IoFilter">
-            <bean class="com.example.KeepAliveFilter"/>
-            <bean class="com.example.DropGreetingFilter"/>
-        </list>
-    </constructor-arg>
-</bean>
-----------------------------------------------------------------------------------
-
-[[MINA-SeeAlso]]
-See Also
-^^^^^^^^
-
-* link:configuring-camel.html[Configuring Camel]
-* link:component.html[Component]
-* link:endpoint.html[Endpoint]
-* link:getting-started.html[Getting Started]
-
-* link:mina2.html[MINA2]
-* link:netty.html[Netty]
-