[
https://issues.apache.org/jira/browse/CAMEL-11937?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16216443#comment-16216443
]
ASF GitHub Bot commented on CAMEL-11937:
----------------------------------------
oscerd closed pull request #2054: CAMEL-11937 - Fix syntax for IEC 608870
component
URL: https://github.com/apache/camel/pull/2054
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 b91c44a4351..68ba87d2836 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 5e6fa563bf2..9ac363c6f91 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 bf440abc193..498d46b5f62 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 @@
* 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 b3688ec8746..d7756309098 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 @@
* 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> {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Fix syntax for iec60870 component
> ---------------------------------
>
> Key: CAMEL-11937
> URL: https://issues.apache.org/jira/browse/CAMEL-11937
> Project: Camel
> Issue Type: Bug
> Components: camel-iec60870
> Affects Versions: 2.20.0
> Reporter: Aurélien Pupier
> Assignee: Andrea Cosentino
> Priority: Minor
> Fix For: 2.20.1, 2.21.0
>
>
> it seems that there is an issue withe several iec60870 component;
> iec60870-client uriPath iec60870-client:endpointUri
> iec60870-server uriPath iec60870-server:endpointUri
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
