You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/10/24 07:23:35 UTC
[camel] branch master updated: CAMEL-11937 - Fix syntax for IEC
608870 component
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new a11f6a0 CAMEL-11937 - Fix syntax for IEC 608870 component
a11f6a0 is described below
commit a11f6a00c9c30e2965f869a3402a57ebc54f523a
Author: Aurélien Pupier <ap...@redhat.com>
AuthorDate: Mon Oct 23 11:30:09 2017 +0200
CAMEL-11937 - Fix syntax for IEC 608870 component
Signed-off-by: Aurélien Pupier <ap...@redhat.com>
---
.../camel-iec60870/src/main/docs/iec60870-client-component.adoc | 4 ++--
.../camel-iec60870/src/main/docs/iec60870-server-component.adoc | 2 +-
.../org/apache/camel/component/iec60870/client/ClientEndpoint.java | 2 +-
.../org/apache/camel/component/iec60870/server/ServerEndpoint.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/components/camel-iec60870/src/main/docs/iec60870-client-component.adoc b/components/camel-iec60870/src/main/docs/iec60870-client-component.adoc
index b91c44a..68ba87d 100644
--- a/components/camel-iec60870/src/main/docs/iec60870-client-component.adoc
+++ b/components/camel-iec60870/src/main/docs/iec60870-client-component.adoc
@@ -55,7 +55,7 @@ with zero.
The IEC 60870 Client endpoint is configured using URI syntax:
----
-iec60870-client:endpointUri
+iec60870-client:uriPath
----
with the following path and query parameters:
@@ -112,4 +112,4 @@ The final connection options will be evaluated in the following order:
* Otherwise the +defaultConnectionOptions+ instance is copied and customized in the following steps
* Apply +protocolOptions+ if present
* Apply +dataModuleOptions+ if present
-* Apply all explicit connection parameters (e.g. +timeZone+)
\ No newline at end of file
+* Apply all explicit connection parameters (e.g. +timeZone+)
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 5e6fa56..9ac363c 100644
--- a/components/camel-iec60870/src/main/docs/iec60870-server-component.adoc
+++ b/components/camel-iec60870/src/main/docs/iec60870-server-component.adoc
@@ -58,7 +58,7 @@ with zero.
The IEC 60870 Server endpoint is configured using URI syntax:
----
-iec60870-server:endpointUri
+iec60870-server:uriPath
----
with the following path and query parameters:
diff --git a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientEndpoint.java b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientEndpoint.java
index bf440ab..498d46b 100644
--- a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientEndpoint.java
+++ b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientEndpoint.java
@@ -30,7 +30,7 @@ import org.apache.camel.spi.UriEndpoint;
* IEC 60870 component used for telecontrol (supervisory control and data acquisition)
* such as controlling electric power transmission grids and other geographically widespread control systems.
*/
-@UriEndpoint(firstVersion = "2.20.0", scheme = "iec60870-client", syntax = "iec60870-client:endpointUri",
+@UriEndpoint(firstVersion = "2.20.0", scheme = "iec60870-client", syntax = "iec60870-client:uriPath",
title = "IEC 60870 Client", consumerClass = ClientConsumer.class, label = "iot")
public class ClientEndpoint extends AbstractIecEndpoint<ClientConnectionMultiplexor> {
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 b3688ec..d775630 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
@@ -31,7 +31,7 @@ import org.apache.camel.spi.UriParam;
* IEC 60870 component used for telecontrol (supervisory control and data acquisition)
* 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",
+@UriEndpoint(firstVersion = "2.20.0", scheme = "iec60870-server", syntax = "iec60870-server:uriPath",
title = "IEC 60870 Server", consumerClass = ServerConsumer.class, label = "iot")
public class ServerEndpoint extends AbstractIecEndpoint<ServerConnectionMultiplexor> {
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].