Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4a8acc24 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4a8acc24 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4a8acc24 Branch: refs/heads/master Commit: 4a8acc246034cfb503f30d92c322209086f532cd Parents: 4f81dc6 Author: Claus Ibsen <[email protected]> Authored: Sat Sep 23 09:36:46 2017 +0200 Committer: Claus Ibsen <[email protected]> Committed: Sat Sep 23 09:36:46 2017 +0200 ---------------------------------------------------------------------- .../src/main/docs/iec60870-server-component.adoc | 7 +++---- .../camel/component/iec60870/server/ServerEndpoint.java | 2 +- components/camel-swagger/pom.xml | 2 +- components/readme.adoc | 11 +++++++---- docs/user-manual/en/SUMMARY.md | 3 ++- 5 files changed, 14 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4a8acc24/components/camel-iec60870/src/main/docs/iec60870-server-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-iec60870/src/main/docs/iec60870-server-component.adoc b/components/camel-iec60870/src/main/docs/iec60870-server-component.adoc index ba3f6af..5e6fa56 100644 --- a/components/camel-iec60870/src/main/docs/iec60870-server-component.adoc +++ b/components/camel-iec60870/src/main/docs/iec60870-server-component.adoc @@ -1,4 +1,4 @@ -== IEC 60870-5-104 Server Component +== IEC 60870 Server Component *Available as of Camel version 2.20* @@ -20,7 +20,7 @@ for this component: // component options: START -The IEC 60870-5-104 Server component supports 2 options which are listed below. +The IEC 60870 Server component supports 2 options which are listed below. @@ -55,7 +55,7 @@ with zero. // endpoint options: START -The IEC 60870-5-104 Server endpoint is configured using URI syntax: +The IEC 60870 Server endpoint is configured using URI syntax: ---- iec60870-server:endpointUri @@ -97,4 +97,3 @@ with the following path and query parameters: | *connectionId* (id) | An identifier grouping connection instances | | String |=== // endpoint options: END - http://git-wip-us.apache.org/repos/asf/camel/blob/4a8acc24/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerEndpoint.java b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerEndpoint.java index 19681d3..b3688ec 100644 --- a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerEndpoint.java +++ b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerEndpoint.java @@ -32,7 +32,7 @@ import org.apache.camel.spi.UriParam; * such as controlling electric power transmission grids and other geographically widespread control systems. */ @UriEndpoint(firstVersion = "2.20.0", scheme = "iec60870-server", syntax = "iec60870-server:endpointUri", - title = "IEC 60870-5-104 Server", consumerClass = ServerConsumer.class, label = "iot") + title = "IEC 60870 Server", consumerClass = ServerConsumer.class, label = "iot") public class ServerEndpoint extends AbstractIecEndpoint<ServerConnectionMultiplexor> { /** http://git-wip-us.apache.org/repos/asf/camel/blob/4a8acc24/components/camel-swagger/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-swagger/pom.xml b/components/camel-swagger/pom.xml index 9222547..192d18a 100644 --- a/components/camel-swagger/pom.xml +++ b/components/camel-swagger/pom.xml @@ -29,7 +29,7 @@ <artifactId>camel-swagger</artifactId> <packaging>jar</packaging> <name>Camel :: Swagger (deprecated)</name> - <description>Rest-dsl support for using swagger api-doc</description> + <description>Rest-dsl support for using swagger api-doc (uses Scala)</description> <properties> <!-- use by camel-catalog --> http://git-wip-us.apache.org/repos/asf/camel/blob/4a8acc24/components/readme.adoc ---------------------------------------------------------------------- diff --git a/components/readme.adoc b/components/readme.adoc index 5815e8a..87e713e 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -2,7 +2,7 @@ Components ^^^^^^^^^^ // components: START -Number of Components: 280 in 192 JAR artifacts (17 deprecated) +Number of Components: 281 in 193 JAR artifacts (17 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -354,10 +354,10 @@ Number of Components: 280 in 192 JAR artifacts (17 deprecated) `ibatis:statement` | 1.2 | *deprecated* Performs a query poll insert update or delete in a relational database using Apache iBATIS. | link:camel-iec60870/src/main/docs/iec60870-client-component.adoc[IEC 60870 Client] (camel-iec60870) + -`iec60870-client:endpointUri` | 2.20 | Camel IEC 60870-5-104 support +`iec60870-client:endpointUri` | 2.20 | IEC 60870 component used for telecontrol (supervisory control and data acquisition) such as controlling electric power transmission grids and other geographically widespread control systems. -| link:camel-iec60870/src/main/docs/iec60870-server-component.adoc[IEC 60870-5-104 server] (camel-iec60870) + -`iec60870-server:endpointUri` | 2.20 | Camel IEC 60870-5-104 support +| link:camel-iec60870/src/main/docs/iec60870-server-component.adoc[IEC 60870-5-104 Server] (camel-iec60870) + +`iec60870-server:endpointUri` | 2.20 | IEC 60870 component used for telecontrol (supervisory control and data acquisition) such as controlling electric power transmission grids and other geographically widespread control systems. | link:camel-ignite/src/main/docs/ignite-cache-component.adoc[Ignite Cache] (camel-ignite) + `ignite-cache:cacheName` | 2.17 | The Ignite Cache endpoint is one of camel-ignite endpoints which allows you to interact with an Ignite Cache. @@ -500,6 +500,9 @@ Number of Components: 280 in 192 JAR artifacts (17 deprecated) | link:camel-ldap/src/main/docs/ldap-component.adoc[LDAP] (camel-ldap) + `ldap:dirContextName` | 1.5 | The ldap component allows you to perform searches in LDAP servers using filters as the message payload. +| link:camel-ldif/src/main/docs/ldif-component.adoc[LDIF] (camel-ldif) + +`ldif:ldapConnectionName` | 2.20 | The ldif component allows you to do updates on an LDAP server from a LDIF body content. + | link:camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc[Linkedin] (camel-linkedin) + `linkedin:apiName/methodName` | 2.14 | The linkedin component is uses for retrieving LinkedIn user profiles connections companies groups posts etc. http://git-wip-us.apache.org/repos/asf/camel/blob/4a8acc24/docs/user-manual/en/SUMMARY.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index 45d69b0..a26e70d 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -230,7 +230,7 @@ * [HTTP4](http4-component.adoc) * [iBatis](ibatis-component.adoc) * [IEC 60870 Client](iec60870-client-component.adoc) - * [IEC 60870-5-104 server](iec60870-server-component.adoc) + * [IEC 60870 Server](iec60870-server-component.adoc) * [Ignite Cache](ignite-cache-component.adoc) * [Ignite Compute](ignite-compute-component.adoc) * [Ignite Events](ignite-events-component.adoc) @@ -278,6 +278,7 @@ * [Kubernetes Service Account](kubernetes-service-accounts-component.adoc) * [Kubernetes Services](kubernetes-services-component.adoc) * [LDAP](ldap-component.adoc) + * [LDIF](ldif-component.adoc) * [Linkedin](linkedin-component.adoc) * [Lucene](lucene-component.adoc) * [Lumberjack](lumberjack-component.adoc)
