This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new b15db5b4d7c Removal of component iec60870 (#1902)
b15db5b4d7c is described below
commit b15db5b4d7c8fa630f2f825eee6d526d978643db
Author: Aurélien Pupier <[email protected]>
AuthorDate: Wed Aug 26 19:20:09 2026 +0200
Removal of component iec60870 (#1902)
removed in camel core https://github.com/apache/camel/pull/25757
Signed-off-by: Aurélien Pupier <[email protected]>
---
.../camel/springboot/catalog/components.properties | 2 -
.../catalog/components/iec60870-client.json | 72 --------
.../catalog/components/iec60870-server.json | 64 -------
components-starter/camel-iec60870-starter/pom.xml | 49 -----
.../src/main/docs/iec60870.json | 108 -----------
.../ClientComponentAutoConfiguration.java | 73 --------
.../springboot/ClientComponentConfiguration.java | 111 -----------
.../springboot/ClientComponentConverter.java | 63 -------
.../ServerComponentAutoConfiguration.java | 73 --------
.../springboot/ServerComponentConfiguration.java | 111 -----------
.../springboot/ServerComponentConverter.java | 63 -------
.../src/main/resources/META-INF/LICENSE.txt | 203 ---------------------
.../src/main/resources/META-INF/NOTICE.txt | 11 --
...rk.boot.autoconfigure.AutoConfiguration.imports | 21 ---
components-starter/pom.xml | 1 -
docs/spring-boot/modules/ROOT/nav.adoc | 1 -
.../modules/ROOT/pages/starters/iec60870.adoc | 42 -----
.../camel/itest/springboot/CamelIec60870IT.java | 29 ---
tooling/camel-spring-boot-bom/pom.xml | 5 -
tooling/camel-spring-boot-dependencies/pom.xml | 10 -
20 files changed, 1112 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
index 0f64a559dbb..60e25f6372a 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
@@ -179,8 +179,6 @@ ibm-watson-language
ibm-watson-speech-to-text
ibm-watson-text-to-speech
ibm-watsonx-ai
-iec60870-client
-iec60870-server
iggy
ignite-cache
ignite-compute
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iec60870-client.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iec60870-client.json
deleted file mode 100644
index 473671f5554..00000000000
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iec60870-client.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
- "component": {
- "kind": "component",
- "name": "iec60870-client",
- "title": "IEC 60870 Client",
- "description": "IEC 60870 supervisory control and data acquisition (SCADA)
client using NeoSCADA implementation.",
- "deprecated": true,
- "firstVersion": "2.20.0",
- "label": "iot",
- "javaType": "org.apache.camel.component.iec60870.client.ClientComponent",
- "supportLevel": "Stable",
- "groupId": "org.apache.camel.springboot",
- "artifactId": "camel-iec60870-starter",
- "version": "4.23.0-SNAPSHOT",
- "scheme": "iec60870-client",
- "extendsScheme": "",
- "syntax": "iec60870-client:uriPath",
- "async": false,
- "api": false,
- "consumerOnly": false,
- "producerOnly": false,
- "lenientProperties": false,
- "browsable": false,
- "remote": true
- },
- "componentProperties": {
- "defaultConnectionOptions": { "index": 0, "kind": "property",
"displayName": "Default Connection Options", "group": "common", "label": "",
"required": false, "type": "object", "javaType":
"org.apache.camel.component.iec60870.client.ClientOptions", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "Default connection options" },
- "bridgeErrorHandler": { "index": 1, "kind": "property", "displayName":
"Bridge Error Handler", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Allows for bridging the consumer to the Camel routing Error Handler, which
mean any exceptions (if possible) occurred while the Camel consumer is trying
to pickup incoming messages, or the like [...]
- "lazyStartProducer": { "index": 2, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the producer should be started lazy (on the first message). By
starting lazy you can use this to allow CamelContext and routes to startup in
situations where a producer may otherwise fail [...]
- "autowiredEnabled": { "index": 3, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
- },
- "headers": {
- "CamelIec60870Value": { "index": 0, "kind": "header", "displayName": "",
"group": "consumer", "label": "consumer", "required": false, "javaType":
"Object", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The value", "constantName":
"org.apache.camel.component.iec60870.Constants#IEC60870_VALUE" },
- "CamelIec60870Timestamp": { "index": 1, "kind": "header", "displayName":
"", "group": "consumer", "label": "consumer", "required": false, "javaType":
"long", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The timestamp of the value", "constantName":
"org.apache.camel.component.iec60870.Constants#IEC60870_TIMESTAMP" },
- "CamelIec60870Quality": { "index": 2, "kind": "header", "displayName": "",
"group": "consumer", "label": "consumer", "required": false, "javaType":
"org.eclipse.neoscada.protocol.iec60870.asdu.types.QualityInformation",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The quality information of the value", "constantName":
"org.apache.camel.component.iec60870.Constants#IEC60870_QUALITY" },
- "CamelIec60870Overflow": { "index": 3, "kind": "header", "displayName":
"", "group": "consumer", "label": "consumer", "required": false, "javaType":
"boolean", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "Is overflow", "constantName":
"org.apache.camel.component.iec60870.Constants#IEC60870_OVERFLOW" },
- "CamelIec60870ConnectionState": { "index": 4, "kind": "header",
"displayName": "", "group": "consumer", "label": "consumer", "required": false,
"javaType":
"org.eclipse.neoscada.protocol.iec60870.client.AutoConnectClient.State",
"enum": [ "SLEEPING", "DISCONNECTED", "LOOKUP", "CONNECTING", "CONNECTED" ],
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The connection state (CONNECTED, DISCONNECTED, etc.)",
"constantName": "org.apache.ca [...]
- "CamelIec60870ConnectionError": { "index": 5, "kind": "header",
"displayName": "", "group": "consumer", "label": "consumer", "required": false,
"javaType": "Throwable", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "The connection state error
if any", "constantName":
"org.apache.camel.component.iec60870.Constants#IEC60870_CONNECTION_ERROR" },
- "CamelIec60870ConnectionUptime": { "index": 6, "kind": "header",
"displayName": "", "group": "consumer", "label": "consumer", "required": false,
"javaType": "long", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Connection uptime in milliseconds since
last connected", "constantName":
"org.apache.camel.component.iec60870.Constants#IEC60870_CONNECTION_UPTIME" },
- "CamelIec60870CommandType": { "index": 7, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"String", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The command type: 'value' (default),
'interrogation', 'read', or 'status'", "constantName":
"org.apache.camel.component.iec60870.Constants#IEC60870_COMMAND_TYPE" },
- "CamelIec60870AsduAddress": { "index": 8, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"org.eclipse.neoscada.protocol.iec60870.asdu.types.ASDUAddress", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "The ASDU address for interrogation (optional, defaults to
broadcast)", "constantName":
"org.apache.camel.component.iec60870.Constants#IEC60870_ASDU_ADDRESS" },
- "CamelIec60870Qoi": { "index": 9, "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"short", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The qualifier of interrogation: 20 (global) or
21-36 (groups 1-16)", "constantName":
"org.apache.camel.component.iec60870.Constants#IEC60870_QOI" },
- "CamelIec60870QualityBlocked": { "index": 10, "kind": "header",
"displayName": "", "group": "consumer", "label": "consumer", "required": false,
"javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Quality flag: Blocked (BL)",
"constantName":
"org.apache.camel.component.iec60870.Constants#IEC60870_QUALITY_BLOCKED" },
- "CamelIec60870QualitySubstituted": { "index": 11, "kind": "header",
"displayName": "", "group": "consumer", "label": "consumer", "required": false,
"javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Quality flag: Substituted (SB)",
"constantName":
"org.apache.camel.component.iec60870.Constants#IEC60870_QUALITY_SUBSTITUTED" },
- "CamelIec60870QualityNotTopical": { "index": 12, "kind": "header",
"displayName": "", "group": "consumer", "label": "consumer", "required": false,
"javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Quality flag: Not topical (NT)",
"constantName":
"org.apache.camel.component.iec60870.Constants#IEC60870_QUALITY_NOT_TOPICAL" },
- "CamelIec60870QualityValid": { "index": 13, "kind": "header",
"displayName": "", "group": "consumer", "label": "consumer", "required": false,
"javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Quality flag: Invalid (IV)",
"constantName":
"org.apache.camel.component.iec60870.Constants#IEC60870_QUALITY_VALID" },
- "CamelIec60870CauseOfTransmission": { "index": 14, "kind": "header",
"displayName": "", "group": "consumer", "label": "consumer", "required": false,
"javaType":
"org.eclipse.neoscada.protocol.iec60870.asdu.types.CauseOfTransmission",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The cause of transmission", "constantName":
"org.apache.camel.component.iec60870.Constants#IEC60870_CAUSE_OF_TRANSMISSION" }
- },
- "properties": {
- "uriPath": { "index": 0, "kind": "path", "displayName": "Uri Path",
"group": "common", "label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.iec60870.ObjectAddress", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "The
object information address" },
- "dataModuleOptions": { "index": 1, "kind": "parameter", "displayName":
"Data Module Options", "group": "common", "label": "", "required": false,
"type": "object", "javaType":
"org.eclipse.neoscada.protocol.iec60870.client.data.DataModuleOptions",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Data module options"
},
- "protocolOptions": { "index": 2, "kind": "parameter", "displayName":
"Protocol Options", "group": "common", "label": "", "required": false, "type":
"object", "javaType": "org.eclipse.neoscada.protocol.iec60870.ProtocolOptions",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Protocol options" },
- "bridgeErrorHandler": { "index": 3, "kind": "parameter", "displayName":
"Bridge Error Handler", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions (if possible) occurred
while the Camel consumer is trying to pickup incoming [...]
- "exceptionHandler": { "index": 4, "kind": "parameter", "displayName":
"Exception Handler", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By def [...]
- "exchangePattern": { "index": 5, "kind": "parameter", "displayName":
"Exchange Pattern", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "enum", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ],
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
- "lazyStartProducer": { "index": 6, "kind": "parameter", "displayName":
"Lazy Start Producer", "group": "producer (advanced)", "label":
"producer,advanced", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a produc [...]
- "acknowledgeWindow": { "index": 7, "kind": "parameter", "displayName":
"Acknowledge Window", "group": "connection", "label": "connection", "required":
false, "type": "integer", "javaType": "short", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": 10, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Parameter W -
Acknowledgment window." },
- "adsuAddressType": { "index": 8, "kind": "parameter", "displayName": "Adsu
Address Type", "group": "connection", "label": "connection", "required": false,
"type": "enum", "javaType":
"org.eclipse.neoscada.protocol.iec60870.ASDUAddressType", "enum": [ "SIZE_1",
"SIZE_2" ], "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "The common ASDU
[...]
- "causeOfTransmissionType": { "index": 9, "kind": "parameter",
"displayName": "Cause Of Transmission Type", "group": "connection", "label":
"connection", "required": false, "type": "enum", "javaType":
"org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType", "enum": [
"SIZE_1", "SIZE_2" ], "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "descri [...]
- "informationObjectAddressType": { "index": 10, "kind": "parameter",
"displayName": "Information Object Address Type", "group": "connection",
"label": "connection", "required": false, "type": "enum", "javaType":
"org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType", "enum":
[ "SIZE_1", "SIZE_2", "SIZE_3" ], "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "c [...]
- "maxUnacknowledged": { "index": 11, "kind": "parameter", "displayName":
"Max Unacknowledged", "group": "connection", "label": "connection", "required":
false, "type": "integer", "javaType": "short", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": 15, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Parameter K -
Maximum number of un-acknowledged messages." },
- "timeout1": { "index": 12, "kind": "parameter", "displayName": "Timeout1",
"group": "connection", "label": "connection", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 15000, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Timeout T1 in
milliseconds." },
- "timeout2": { "index": 13, "kind": "parameter", "displayName": "Timeout2",
"group": "connection", "label": "connection", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 10000, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Timeout T2 in
milliseconds." },
- "timeout3": { "index": 14, "kind": "parameter", "displayName": "Timeout3",
"group": "connection", "label": "connection", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 20000, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Timeout T3 in
milliseconds." },
- "causeSourceAddress": { "index": 15, "kind": "parameter", "displayName":
"Cause Source Address", "group": "data", "label": "data", "required": false,
"type": "integer", "javaType": "byte", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Whether to include
the source address" },
- "connectionTimeout": { "index": 16, "kind": "parameter", "displayName":
"Connection Timeout", "group": "data", "label": "data", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 10000, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Timeout in millis to
wait for client to establish a connected connection." },
- "ignoreBackgroundScan": { "index": 17, "kind": "parameter", "displayName":
"Ignore Background Scan", "group": "data", "label": "data", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Whether background
scan transmissions should be ignored." },
- "ignoreDaylightSavingTime": { "index": 18, "kind": "parameter",
"displayName": "Ignore Daylight Saving Time", "group": "data", "label": "data",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Whether to ignore or
respect DST" },
- "timeZone": { "index": 19, "kind": "parameter", "displayName": "Time
Zone", "group": "data", "label": "data", "required": false, "type": "object",
"javaType": "java.util.TimeZone", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "UTC", "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "The timezone to use.
May be any Java time zone string" },
- "connectionId": { "index": 20, "kind": "parameter", "displayName":
"Connection Id", "group": "id", "label": "id", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "An identifier grouping connection
instances" }
- }
-}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iec60870-server.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iec60870-server.json
deleted file mode 100644
index 2ed753fce3a..00000000000
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iec60870-server.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
- "component": {
- "kind": "component",
- "name": "iec60870-server",
- "title": "IEC 60870 Server",
- "description": "IEC 60870 supervisory control and data acquisition (SCADA)
server using NeoSCADA implementation.",
- "deprecated": true,
- "firstVersion": "2.20.0",
- "label": "iot",
- "javaType": "org.apache.camel.component.iec60870.server.ServerComponent",
- "supportLevel": "Stable",
- "groupId": "org.apache.camel.springboot",
- "artifactId": "camel-iec60870-starter",
- "version": "4.23.0-SNAPSHOT",
- "scheme": "iec60870-server",
- "extendsScheme": "",
- "syntax": "iec60870-server:uriPath",
- "async": false,
- "api": false,
- "consumerOnly": false,
- "producerOnly": false,
- "lenientProperties": false,
- "browsable": false,
- "remote": true
- },
- "componentProperties": {
- "defaultConnectionOptions": { "index": 0, "kind": "property",
"displayName": "Default Connection Options", "group": "common", "label": "",
"required": false, "type": "object", "javaType":
"org.apache.camel.component.iec60870.server.ServerOptions", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "Default connection options" },
- "bridgeErrorHandler": { "index": 1, "kind": "property", "displayName":
"Bridge Error Handler", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Allows for bridging the consumer to the Camel routing Error Handler, which
mean any exceptions (if possible) occurred while the Camel consumer is trying
to pickup incoming messages, or the like [...]
- "lazyStartProducer": { "index": 2, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the producer should be started lazy (on the first message). By
starting lazy you can use this to allow CamelContext and routes to startup in
situations where a producer may otherwise fail [...]
- "autowiredEnabled": { "index": 3, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
- },
- "headers": {
- "address": { "index": 0, "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType":
"org.apache.camel.component.iec60870.ObjectAddress", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "The
address as ObjectAddress", "constantName":
"org.apache.camel.component.iec60870.Constants#ADDRESS" },
- "value": { "index": 1, "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "Object",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The value", "constantName":
"org.apache.camel.component.iec60870.Constants#VALUE" },
- "informationObjectAddress": { "index": 2, "kind": "header", "displayName":
"", "group": "consumer", "label": "consumer", "required": false, "javaType":
"org.eclipse.neoscada.protocol.iec60870.asdu.types.InformationObjectAddress",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The address as InformationObjectAddress",
"constantName":
"org.apache.camel.component.iec60870.Constants#INFORMATION_OBJECT_ADDRESS" },
- "asduHeader": { "index": 3, "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType":
"org.eclipse.neoscada.protocol.iec60870.asdu.ASDUHeader", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "The
ASDU header", "constantName":
"org.apache.camel.component.iec60870.Constants#ASDU_HEADER" },
- "type": { "index": 4, "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "byte",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The type", "constantName":
"org.apache.camel.component.iec60870.Constants#TYPE" },
- "execute": { "index": 5, "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "boolean",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "Is execute", "constantName":
"org.apache.camel.component.iec60870.Constants#EXECUTE" }
- },
- "properties": {
- "uriPath": { "index": 0, "kind": "path", "displayName": "Uri Path",
"group": "common", "label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.iec60870.ObjectAddress", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "The
object information address" },
- "dataModuleOptions": { "index": 1, "kind": "parameter", "displayName":
"Data Module Options", "group": "common", "label": "", "required": false,
"type": "object", "javaType":
"org.eclipse.neoscada.protocol.iec60870.client.data.DataModuleOptions",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Data module options"
},
- "filterNonExecute": { "index": 2, "kind": "parameter", "displayName":
"Filter Non Execute", "group": "common", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Filter out all
requests which don't have the execute bit set" },
- "protocolOptions": { "index": 3, "kind": "parameter", "displayName":
"Protocol Options", "group": "common", "label": "", "required": false, "type":
"object", "javaType": "org.eclipse.neoscada.protocol.iec60870.ProtocolOptions",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Protocol options" },
- "bridgeErrorHandler": { "index": 4, "kind": "parameter", "displayName":
"Bridge Error Handler", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions (if possible) occurred
while the Camel consumer is trying to pickup incoming [...]
- "exceptionHandler": { "index": 5, "kind": "parameter", "displayName":
"Exception Handler", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By def [...]
- "exchangePattern": { "index": 6, "kind": "parameter", "displayName":
"Exchange Pattern", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "enum", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ],
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
- "lazyStartProducer": { "index": 7, "kind": "parameter", "displayName":
"Lazy Start Producer", "group": "producer (advanced)", "label":
"producer,advanced", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a produc [...]
- "acknowledgeWindow": { "index": 8, "kind": "parameter", "displayName":
"Acknowledge Window", "group": "connection", "label": "connection", "required":
false, "type": "integer", "javaType": "short", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": 10, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Parameter W -
Acknowledgment window." },
- "adsuAddressType": { "index": 9, "kind": "parameter", "displayName": "Adsu
Address Type", "group": "connection", "label": "connection", "required": false,
"type": "enum", "javaType":
"org.eclipse.neoscada.protocol.iec60870.ASDUAddressType", "enum": [ "SIZE_1",
"SIZE_2" ], "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "The common ASDU
[...]
- "causeOfTransmissionType": { "index": 10, "kind": "parameter",
"displayName": "Cause Of Transmission Type", "group": "connection", "label":
"connection", "required": false, "type": "enum", "javaType":
"org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType", "enum": [
"SIZE_1", "SIZE_2" ], "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "descr [...]
- "informationObjectAddressType": { "index": 11, "kind": "parameter",
"displayName": "Information Object Address Type", "group": "connection",
"label": "connection", "required": false, "type": "enum", "javaType":
"org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType", "enum":
[ "SIZE_1", "SIZE_2", "SIZE_3" ], "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "c [...]
- "maxUnacknowledged": { "index": 12, "kind": "parameter", "displayName":
"Max Unacknowledged", "group": "connection", "label": "connection", "required":
false, "type": "integer", "javaType": "short", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": 15, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Parameter K -
Maximum number of un-acknowledged messages." },
- "timeout1": { "index": 13, "kind": "parameter", "displayName": "Timeout1",
"group": "connection", "label": "connection", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 15000, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Timeout T1 in
milliseconds." },
- "timeout2": { "index": 14, "kind": "parameter", "displayName": "Timeout2",
"group": "connection", "label": "connection", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 10000, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Timeout T2 in
milliseconds." },
- "timeout3": { "index": 15, "kind": "parameter", "displayName": "Timeout3",
"group": "connection", "label": "connection", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 20000, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Timeout T3 in
milliseconds." },
- "causeSourceAddress": { "index": 16, "kind": "parameter", "displayName":
"Cause Source Address", "group": "data", "label": "data", "required": false,
"type": "integer", "javaType": "byte", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Whether to include
the source address" },
- "connectionTimeout": { "index": 17, "kind": "parameter", "displayName":
"Connection Timeout", "group": "data", "label": "data", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 10000, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Timeout in millis to
wait for client to establish a connected connection." },
- "ignoreBackgroundScan": { "index": 18, "kind": "parameter", "displayName":
"Ignore Background Scan", "group": "data", "label": "data", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Whether background
scan transmissions should be ignored." },
- "ignoreDaylightSavingTime": { "index": 19, "kind": "parameter",
"displayName": "Ignore Daylight Saving Time", "group": "data", "label": "data",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Whether to ignore or
respect DST" },
- "timeZone": { "index": 20, "kind": "parameter", "displayName": "Time
Zone", "group": "data", "label": "data", "required": false, "type": "object",
"javaType": "java.util.TimeZone", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "UTC", "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "The timezone to use.
May be any Java time zone string" },
- "connectionId": { "index": 21, "kind": "parameter", "displayName":
"Connection Id", "group": "id", "label": "id", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "An identifier grouping connection
instances" }
- }
-}
diff --git a/components-starter/camel-iec60870-starter/pom.xml
b/components-starter/camel-iec60870-starter/pom.xml
deleted file mode 100644
index 8c185dbe68a..00000000000
--- a/components-starter/camel-iec60870-starter/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>components-starter</artifactId>
- <version>4.23.0-SNAPSHOT</version>
- </parent>
- <artifactId>camel-iec60870-starter</artifactId>
- <packaging>jar</packaging>
- <name>Camel SB Starters :: IEC 60870</name>
- <description>Spring-Boot Starter for Camel IEC 60870-5-104
support</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-iec60870</artifactId>
- <version>${camel-version}</version>
- </dependency>
- <!--START OF GENERATED CODE-->
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-core-starter</artifactId>
- </dependency>
- <!--END OF GENERATED CODE-->
- </dependencies>
-</project>
diff --git
a/components-starter/camel-iec60870-starter/src/main/docs/iec60870.json
b/components-starter/camel-iec60870-starter/src/main/docs/iec60870.json
deleted file mode 100644
index 52a5af435ba..00000000000
--- a/components-starter/camel-iec60870-starter/src/main/docs/iec60870.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
- "groups": [
- {
- "name": "camel.component.iec60870-client",
- "type":
"org.apache.camel.component.iec60870.client.springboot.ClientComponentConfiguration",
- "sourceType":
"org.apache.camel.component.iec60870.client.springboot.ClientComponentConfiguration"
- },
- {
- "name": "camel.component.iec60870-client.customizer",
- "type":
"org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties",
- "sourceType":
"org.apache.camel.component.iec60870.client.springboot.ClientComponentConfiguration",
- "sourceMethod": "getCustomizer()"
- },
- {
- "name": "camel.component.iec60870-server",
- "type":
"org.apache.camel.component.iec60870.server.springboot.ServerComponentConfiguration",
- "sourceType":
"org.apache.camel.component.iec60870.server.springboot.ServerComponentConfiguration"
- },
- {
- "name": "camel.component.iec60870-server.customizer",
- "type":
"org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties",
- "sourceType":
"org.apache.camel.component.iec60870.server.springboot.ServerComponentConfiguration",
- "sourceMethod": "getCustomizer()"
- }
- ],
- "properties": [
- {
- "name": "camel.component.iec60870-client.autowired-enabled",
- "type": "java.lang.Boolean",
- "description": "Whether autowiring is enabled. This is used for
automatic autowiring options (the option must be marked as autowired) by
looking up in the registry to find if there is a single instance of matching
type, which then gets configured on the component. This can be used for
automatic configuring JDBC data sources, JMS connection factories, AWS Clients,
etc.",
- "sourceType":
"org.apache.camel.component.iec60870.client.springboot.ClientComponentConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.component.iec60870-client.bridge-error-handler",
- "type": "java.lang.Boolean",
- "description": "Allows for bridging the consumer to the Camel routing
Error Handler, which mean any exceptions (if possible) occurred while the Camel
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled by the routing Error Handler. Important:
This is only possible if the 3rd party component allows Camel to be alerted if
an exception was thrown. Some components handle this internally only, and
therefore bridgeErrorHandler is n [...]
- "sourceType":
"org.apache.camel.component.iec60870.client.springboot.ClientComponentConfiguration",
- "defaultValue": false
- },
- {
- "name": "camel.component.iec60870-client.customizer.enabled",
- "type": "java.lang.Boolean",
- "sourceType":
"org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties"
- },
- {
- "name": "camel.component.iec60870-client.default-connection-options",
- "type": "org.apache.camel.component.iec60870.client.ClientOptions",
- "description": "Default connection options. The option is a
org.apache.camel.component.iec60870.client.ClientOptions type.",
- "sourceType":
"org.apache.camel.component.iec60870.client.springboot.ClientComponentConfiguration"
- },
- {
- "name": "camel.component.iec60870-client.enabled",
- "type": "java.lang.Boolean",
- "description": "Whether to enable auto configuration of the
iec60870-client component. This is enabled by default.",
- "sourceType":
"org.apache.camel.component.iec60870.client.springboot.ClientComponentConfiguration"
- },
- {
- "name": "camel.component.iec60870-client.lazy-start-producer",
- "type": "java.lang.Boolean",
- "description": "Whether the producer should be started lazy (on the
first message). By starting lazy you can use this to allow CamelContext and
routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and starting the [...]
- "sourceType":
"org.apache.camel.component.iec60870.client.springboot.ClientComponentConfiguration",
- "defaultValue": false
- },
- {
- "name": "camel.component.iec60870-server.autowired-enabled",
- "type": "java.lang.Boolean",
- "description": "Whether autowiring is enabled. This is used for
automatic autowiring options (the option must be marked as autowired) by
looking up in the registry to find if there is a single instance of matching
type, which then gets configured on the component. This can be used for
automatic configuring JDBC data sources, JMS connection factories, AWS Clients,
etc.",
- "sourceType":
"org.apache.camel.component.iec60870.server.springboot.ServerComponentConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.component.iec60870-server.bridge-error-handler",
- "type": "java.lang.Boolean",
- "description": "Allows for bridging the consumer to the Camel routing
Error Handler, which mean any exceptions (if possible) occurred while the Camel
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled by the routing Error Handler. Important:
This is only possible if the 3rd party component allows Camel to be alerted if
an exception was thrown. Some components handle this internally only, and
therefore bridgeErrorHandler is n [...]
- "sourceType":
"org.apache.camel.component.iec60870.server.springboot.ServerComponentConfiguration",
- "defaultValue": false
- },
- {
- "name": "camel.component.iec60870-server.customizer.enabled",
- "type": "java.lang.Boolean",
- "sourceType":
"org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties"
- },
- {
- "name": "camel.component.iec60870-server.default-connection-options",
- "type": "org.apache.camel.component.iec60870.server.ServerOptions",
- "description": "Default connection options. The option is a
org.apache.camel.component.iec60870.server.ServerOptions type.",
- "sourceType":
"org.apache.camel.component.iec60870.server.springboot.ServerComponentConfiguration"
- },
- {
- "name": "camel.component.iec60870-server.enabled",
- "type": "java.lang.Boolean",
- "description": "Whether to enable auto configuration of the
iec60870-server component. This is enabled by default.",
- "sourceType":
"org.apache.camel.component.iec60870.server.springboot.ServerComponentConfiguration"
- },
- {
- "name": "camel.component.iec60870-server.lazy-start-producer",
- "type": "java.lang.Boolean",
- "description": "Whether the producer should be started lazy (on the
first message). By starting lazy you can use this to allow CamelContext and
routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and starting the [...]
- "sourceType":
"org.apache.camel.component.iec60870.server.springboot.ServerComponentConfiguration",
- "defaultValue": false
- }
- ],
- "hints": [],
- "ignored": {
- "properties": []
- }
-}
\ No newline at end of file
diff --git
a/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/client/springboot/ClientComponentAutoConfiguration.java
b/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/client/springboot/ClientComponentAutoConfiguration.java
deleted file mode 100644
index 89ef41549de..00000000000
---
a/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/client/springboot/ClientComponentAutoConfiguration.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.iec60870.client.springboot;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Component;
-import org.apache.camel.component.iec60870.client.ClientComponent;
-import org.apache.camel.spi.ComponentCustomizer;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.ComponentConfigurationProperties;
-import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
-import
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
-import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
-import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Lazy;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@AutoConfiguration(after = {CamelAutoConfiguration.class,
ClientComponentConverter.class})
-@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
-@EnableConfigurationProperties({ComponentConfigurationProperties.class,ClientComponentConfiguration.class})
-@ConditionalOnHierarchicalProperties({"camel.component",
"camel.component.iec60870-client"})
-public class ClientComponentAutoConfiguration {
-
- private final ApplicationContext applicationContext;
- private final ClientComponentConfiguration configuration;
-
- public ClientComponentAutoConfiguration(
- org.springframework.context.ApplicationContext applicationContext,
-
org.apache.camel.component.iec60870.client.springboot.ClientComponentConfiguration
configuration) {
- this.applicationContext = applicationContext;
- this.configuration = configuration;
- }
-
- @Lazy
- @Bean
- public ComponentCustomizer configureClientComponent() {
- return new ComponentCustomizer() {
- @Override
- public void configure(String name, Component target) {
- CamelPropertiesHelper.copyProperties(target.getCamelContext(),
configuration, target);
- }
- @Override
- public boolean isEnabled(String name, Component target) {
- return HierarchicalPropertiesEvaluator.evaluate(
- applicationContext,
- "camel.component.customizer",
- "camel.component.iec60870-client.customizer")
- && target instanceof ClientComponent;
- }
- };
- }
-}
\ No newline at end of file
diff --git
a/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/client/springboot/ClientComponentConfiguration.java
b/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/client/springboot/ClientComponentConfiguration.java
deleted file mode 100644
index e6782f5baf5..00000000000
---
a/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/client/springboot/ClientComponentConfiguration.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.iec60870.client.springboot;
-
-import org.apache.camel.component.iec60870.client.ClientOptions;
-import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * IEC 60870 supervisory control and data acquisition (SCADA) client using
- * NeoSCADA implementation.
- *
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@ConfigurationProperties(prefix = "camel.component.iec60870-client")
-public class ClientComponentConfiguration
- extends
- ComponentConfigurationPropertiesCommon {
-
- /**
- * Whether to enable auto configuration of the iec60870-client component.
- * This is enabled by default.
- */
- private Boolean enabled;
- /**
- * Default connection options. The option is a
- * org.apache.camel.component.iec60870.client.ClientOptions type.
- */
- private ClientOptions defaultConnectionOptions;
- /**
- * Allows for bridging the consumer to the Camel routing Error Handler,
- * which mean any exceptions (if possible) occurred while the Camel
consumer
- * is trying to pickup incoming messages, or the likes, will now be
- * processed as a message and handled by the routing Error Handler.
- * Important: This is only possible if the 3rd party component allows Camel
- * to be alerted if an exception was thrown. Some components handle this
- * internally only, and therefore bridgeErrorHandler is not possible. In
- * other situations we may improve the Camel component to hook into the 3rd
- * party component and make this possible for future releases. By default
- * the consumer will use the org.apache.camel.spi.ExceptionHandler to deal
- * with exceptions, that will be logged at WARN or ERROR level and ignored.
- */
- private Boolean bridgeErrorHandler = false;
- /**
- * Whether the producer should be started lazy (on the first message). By
- * starting lazy you can use this to allow CamelContext and routes to
- * startup in situations where a producer may otherwise fail during
starting
- * and cause the route to fail being started. By deferring this startup to
- * be lazy then the startup failure can be handled during routing messages
- * via Camel's routing error handlers. Beware that when the first message
is
- * processed then creating and starting the producer may take a little time
- * and prolong the total processing time of the processing.
- */
- private Boolean lazyStartProducer = false;
- /**
- * Whether autowiring is enabled. This is used for automatic autowiring
- * options (the option must be marked as autowired) by looking up in the
- * registry to find if there is a single instance of matching type, which
- * then gets configured on the component. This can be used for automatic
- * configuring JDBC data sources, JMS connection factories, AWS Clients,
- * etc.
- */
- private Boolean autowiredEnabled = true;
-
- public ClientOptions getDefaultConnectionOptions() {
- return defaultConnectionOptions;
- }
-
- public void setDefaultConnectionOptions(
- ClientOptions defaultConnectionOptions) {
- this.defaultConnectionOptions = defaultConnectionOptions;
- }
-
- public Boolean getBridgeErrorHandler() {
- return bridgeErrorHandler;
- }
-
- public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
- this.bridgeErrorHandler = bridgeErrorHandler;
- }
-
- public Boolean getLazyStartProducer() {
- return lazyStartProducer;
- }
-
- public void setLazyStartProducer(Boolean lazyStartProducer) {
- this.lazyStartProducer = lazyStartProducer;
- }
-
- public Boolean getAutowiredEnabled() {
- return autowiredEnabled;
- }
-
- public void setAutowiredEnabled(Boolean autowiredEnabled) {
- this.autowiredEnabled = autowiredEnabled;
- }
-}
\ No newline at end of file
diff --git
a/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/client/springboot/ClientComponentConverter.java
b/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/client/springboot/ClientComponentConverter.java
deleted file mode 100644
index 24e8088ca81..00000000000
---
a/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/client/springboot/ClientComponentConverter.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.iec60870.client.springboot;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
-import
org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.convert.TypeDescriptor;
-import org.springframework.core.convert.converter.GenericConverter;
-import org.springframework.stereotype.Component;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Configuration(proxyBeanMethods = false)
-@ConfigurationPropertiesBinding
-@Component
-public class ClientComponentConverter implements GenericConverter {
-
- @Autowired
- private ApplicationContext applicationContext;
-
- public Set<ConvertiblePair> getConvertibleTypes() {
- Set<ConvertiblePair> answer = new LinkedHashSet<>();
- answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.iec60870.client.ClientOptions.class));
- return answer;
- }
-
- public Object convert(
- Object source,
- TypeDescriptor sourceType,
- TypeDescriptor targetType) {
- if (source == null) {
- return null;
- }
- String ref = source.toString();
- if (!ref.startsWith("#")) {
- return null;
- }
- ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
- switch (targetType.getName()) {
- case "org.apache.camel.component.iec60870.client.ClientOptions":
return applicationContext.getBean(ref,
org.apache.camel.component.iec60870.client.ClientOptions.class);
- }
- return null;
- }
-}
\ No newline at end of file
diff --git
a/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/server/springboot/ServerComponentAutoConfiguration.java
b/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/server/springboot/ServerComponentAutoConfiguration.java
deleted file mode 100644
index c778431c7c0..00000000000
---
a/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/server/springboot/ServerComponentAutoConfiguration.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.iec60870.server.springboot;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Component;
-import org.apache.camel.component.iec60870.server.ServerComponent;
-import org.apache.camel.spi.ComponentCustomizer;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.ComponentConfigurationProperties;
-import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
-import
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
-import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
-import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Lazy;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@AutoConfiguration(after = {CamelAutoConfiguration.class,
ServerComponentConverter.class})
-@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
-@EnableConfigurationProperties({ComponentConfigurationProperties.class,ServerComponentConfiguration.class})
-@ConditionalOnHierarchicalProperties({"camel.component",
"camel.component.iec60870-server"})
-public class ServerComponentAutoConfiguration {
-
- private final ApplicationContext applicationContext;
- private final ServerComponentConfiguration configuration;
-
- public ServerComponentAutoConfiguration(
- org.springframework.context.ApplicationContext applicationContext,
-
org.apache.camel.component.iec60870.server.springboot.ServerComponentConfiguration
configuration) {
- this.applicationContext = applicationContext;
- this.configuration = configuration;
- }
-
- @Lazy
- @Bean
- public ComponentCustomizer configureServerComponent() {
- return new ComponentCustomizer() {
- @Override
- public void configure(String name, Component target) {
- CamelPropertiesHelper.copyProperties(target.getCamelContext(),
configuration, target);
- }
- @Override
- public boolean isEnabled(String name, Component target) {
- return HierarchicalPropertiesEvaluator.evaluate(
- applicationContext,
- "camel.component.customizer",
- "camel.component.iec60870-server.customizer")
- && target instanceof ServerComponent;
- }
- };
- }
-}
\ No newline at end of file
diff --git
a/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/server/springboot/ServerComponentConfiguration.java
b/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/server/springboot/ServerComponentConfiguration.java
deleted file mode 100644
index 7c10648fba5..00000000000
---
a/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/server/springboot/ServerComponentConfiguration.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.iec60870.server.springboot;
-
-import org.apache.camel.component.iec60870.server.ServerOptions;
-import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * IEC 60870 supervisory control and data acquisition (SCADA) server using
- * NeoSCADA implementation.
- *
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@ConfigurationProperties(prefix = "camel.component.iec60870-server")
-public class ServerComponentConfiguration
- extends
- ComponentConfigurationPropertiesCommon {
-
- /**
- * Whether to enable auto configuration of the iec60870-server component.
- * This is enabled by default.
- */
- private Boolean enabled;
- /**
- * Default connection options. The option is a
- * org.apache.camel.component.iec60870.server.ServerOptions type.
- */
- private ServerOptions defaultConnectionOptions;
- /**
- * Allows for bridging the consumer to the Camel routing Error Handler,
- * which mean any exceptions (if possible) occurred while the Camel
consumer
- * is trying to pickup incoming messages, or the likes, will now be
- * processed as a message and handled by the routing Error Handler.
- * Important: This is only possible if the 3rd party component allows Camel
- * to be alerted if an exception was thrown. Some components handle this
- * internally only, and therefore bridgeErrorHandler is not possible. In
- * other situations we may improve the Camel component to hook into the 3rd
- * party component and make this possible for future releases. By default
- * the consumer will use the org.apache.camel.spi.ExceptionHandler to deal
- * with exceptions, that will be logged at WARN or ERROR level and ignored.
- */
- private Boolean bridgeErrorHandler = false;
- /**
- * Whether the producer should be started lazy (on the first message). By
- * starting lazy you can use this to allow CamelContext and routes to
- * startup in situations where a producer may otherwise fail during
starting
- * and cause the route to fail being started. By deferring this startup to
- * be lazy then the startup failure can be handled during routing messages
- * via Camel's routing error handlers. Beware that when the first message
is
- * processed then creating and starting the producer may take a little time
- * and prolong the total processing time of the processing.
- */
- private Boolean lazyStartProducer = false;
- /**
- * Whether autowiring is enabled. This is used for automatic autowiring
- * options (the option must be marked as autowired) by looking up in the
- * registry to find if there is a single instance of matching type, which
- * then gets configured on the component. This can be used for automatic
- * configuring JDBC data sources, JMS connection factories, AWS Clients,
- * etc.
- */
- private Boolean autowiredEnabled = true;
-
- public ServerOptions getDefaultConnectionOptions() {
- return defaultConnectionOptions;
- }
-
- public void setDefaultConnectionOptions(
- ServerOptions defaultConnectionOptions) {
- this.defaultConnectionOptions = defaultConnectionOptions;
- }
-
- public Boolean getBridgeErrorHandler() {
- return bridgeErrorHandler;
- }
-
- public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
- this.bridgeErrorHandler = bridgeErrorHandler;
- }
-
- public Boolean getLazyStartProducer() {
- return lazyStartProducer;
- }
-
- public void setLazyStartProducer(Boolean lazyStartProducer) {
- this.lazyStartProducer = lazyStartProducer;
- }
-
- public Boolean getAutowiredEnabled() {
- return autowiredEnabled;
- }
-
- public void setAutowiredEnabled(Boolean autowiredEnabled) {
- this.autowiredEnabled = autowiredEnabled;
- }
-}
\ No newline at end of file
diff --git
a/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/server/springboot/ServerComponentConverter.java
b/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/server/springboot/ServerComponentConverter.java
deleted file mode 100644
index 6a556097713..00000000000
---
a/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/server/springboot/ServerComponentConverter.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.iec60870.server.springboot;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
-import
org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.convert.TypeDescriptor;
-import org.springframework.core.convert.converter.GenericConverter;
-import org.springframework.stereotype.Component;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Configuration(proxyBeanMethods = false)
-@ConfigurationPropertiesBinding
-@Component
-public class ServerComponentConverter implements GenericConverter {
-
- @Autowired
- private ApplicationContext applicationContext;
-
- public Set<ConvertiblePair> getConvertibleTypes() {
- Set<ConvertiblePair> answer = new LinkedHashSet<>();
- answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.iec60870.server.ServerOptions.class));
- return answer;
- }
-
- public Object convert(
- Object source,
- TypeDescriptor sourceType,
- TypeDescriptor targetType) {
- if (source == null) {
- return null;
- }
- String ref = source.toString();
- if (!ref.startsWith("#")) {
- return null;
- }
- ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
- switch (targetType.getName()) {
- case "org.apache.camel.component.iec60870.server.ServerOptions":
return applicationContext.getBean(ref,
org.apache.camel.component.iec60870.server.ServerOptions.class);
- }
- return null;
- }
-}
\ No newline at end of file
diff --git
a/components-starter/camel-iec60870-starter/src/main/resources/META-INF/LICENSE.txt
b/components-starter/camel-iec60870-starter/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b1270ff0..00000000000
---
a/components-starter/camel-iec60870-starter/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
diff --git
a/components-starter/camel-iec60870-starter/src/main/resources/META-INF/NOTICE.txt
b/components-starter/camel-iec60870-starter/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf2e6b..00000000000
---
a/components-starter/camel-iec60870-starter/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
diff --git
a/components-starter/camel-iec60870-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
b/components-starter/camel-iec60870-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 6b7e52146f5..00000000000
---
a/components-starter/camel-iec60870-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,21 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-org.apache.camel.component.iec60870.client.springboot.ClientComponentConverter
-org.apache.camel.component.iec60870.client.springboot.ClientComponentAutoConfiguration
-org.apache.camel.component.iec60870.server.springboot.ServerComponentConverter
-org.apache.camel.component.iec60870.server.springboot.ServerComponentAutoConfiguration
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index 1ee517b7ad8..b951b1e4f8b 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -281,7 +281,6 @@
<module>camel-ibm-watson-text-to-speech-starter</module>
<module>camel-ibm-watsonx-ai-starter</module>
<module>camel-ical-starter</module>
- <module>camel-iec60870-starter</module>
<module>camel-iggy-starter</module>
<module>camel-ignite-starter</module>
<module>camel-infinispan-cluster-service-starter</module>
diff --git a/docs/spring-boot/modules/ROOT/nav.adoc
b/docs/spring-boot/modules/ROOT/nav.adoc
index 00314220ad0..799d4b8f77c 100644
--- a/docs/spring-boot/modules/ROOT/nav.adoc
+++ b/docs/spring-boot/modules/ROOT/nav.adoc
@@ -180,7 +180,6 @@
** xref:starters/ibm-watson-text-to-speech.adoc[IBM Watson Text to Speech]
** xref:starters/ibm-watsonx-ai.adoc[IBM watsonx.ai]
** xref:starters/ical.adoc[iCal]
-** xref:starters/iec60870.adoc[IEC 60870 Client]
** xref:starters/iggy.adoc[Iggy]
** xref:starters/ignite.adoc[Ignite Cache]
** xref:starters/infinispan-cluster-service.adoc[Infinispan Cluster Service]
diff --git a/docs/spring-boot/modules/ROOT/pages/starters/iec60870.adoc
b/docs/spring-boot/modules/ROOT/pages/starters/iec60870.adoc
deleted file mode 100644
index 2d910d83532..00000000000
--- a/docs/spring-boot/modules/ROOT/pages/starters/iec60870.adoc
+++ /dev/null
@@ -1,42 +0,0 @@
-// Do not edit directly!
-// This file was generated by camel-spring-boot-generator-maven-plugin
-= IEC 60870 Client
-:artifactid: camel-iec60870-starter
-
-IEC 60870 supervisory control and data acquisition (SCADA) client using
NeoSCADA implementation.
-
-== What's inside
-
-* xref:{csb-camel-components}::iec60870-client-component.adoc[IEC 60870 Client
component], URI syntax: `iec60870-client:uriPath`
-* xref:{csb-camel-components}::iec60870-server-component.adoc[IEC 60870 Server
component], URI syntax: `iec60870-server:uriPath`
-
-Please refer to the above links for usage and configuration details.
-
-== Maven coordinates
-
-[source,xml]
-----
-<dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-iec60870-starter</artifactId>
-</dependency>
-----
-
-== Spring Boot Auto-Configuration
-
-The starter supports 10 options, which are listed below.
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| camel.component.iec60870-client.autowired-enabled | Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which then gets configured on the component. This
can be used for automatic configuring JDBC data sources, JMS connection
factories, AWS Clients, etc. | true | Boolean
-| camel.component.iec60870-client.bridge-error-handler | Allows for bridging
the consumer to the Camel routing Error Handler, which mean any exceptions (if
possible) occurred while the Camel consumer is trying to pickup incoming
messages, or the likes, will now be processed as a message and handled by the
routing Error Handler. Important: This is only possible if the 3rd party
component allows Camel to be alerted if an exception was thrown. Some
components handle this internally only, an [...]
-| camel.component.iec60870-client.default-connection-options | Default
connection options. The option is a
org.apache.camel.component.iec60870.client.ClientOptions type. | |
ClientOptions
-| camel.component.iec60870-client.enabled | Whether to enable auto
configuration of the iec60870-client component. This is enabled by default. |
| Boolean
-| camel.component.iec60870-client.lazy-start-producer | Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during starting and cause the route to fail being started.
By deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is proces [...]
-| camel.component.iec60870-server.autowired-enabled | Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which then gets configured on the component. This
can be used for automatic configuring JDBC data sources, JMS connection
factories, AWS Clients, etc. | true | Boolean
-| camel.component.iec60870-server.bridge-error-handler | Allows for bridging
the consumer to the Camel routing Error Handler, which mean any exceptions (if
possible) occurred while the Camel consumer is trying to pickup incoming
messages, or the likes, will now be processed as a message and handled by the
routing Error Handler. Important: This is only possible if the 3rd party
component allows Camel to be alerted if an exception was thrown. Some
components handle this internally only, an [...]
-| camel.component.iec60870-server.default-connection-options | Default
connection options. The option is a
org.apache.camel.component.iec60870.server.ServerOptions type. | |
ServerOptions
-| camel.component.iec60870-server.enabled | Whether to enable auto
configuration of the iec60870-server component. This is enabled by default. |
| Boolean
-| camel.component.iec60870-server.lazy-start-producer | Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during starting and cause the route to fail being started.
By deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is proces [...]
-|===
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelIec60870IT.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelIec60870IT.java
deleted file mode 100644
index 3be8b33a034..00000000000
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelIec60870IT.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.itest.springboot;
-
-import
org.apache.camel.itest.springboot.common.AbstractSpringBootBaseTestSupport;
-import org.junit.jupiter.api.Test;
-
-public class CamelIec60870IT extends AbstractSpringBootBaseTestSupport {
-
- @Test
- void componentTest() {
- assertComponent("iec60870-client");
- assertComponent("iec60870-server");
- }
-}
diff --git a/tooling/camel-spring-boot-bom/pom.xml
b/tooling/camel-spring-boot-bom/pom.xml
index 055e24b1086..11cd022fe79 100644
--- a/tooling/camel-spring-boot-bom/pom.xml
+++ b/tooling/camel-spring-boot-bom/pom.xml
@@ -938,11 +938,6 @@
<artifactId>camel-ical-starter</artifactId>
<version>4.23.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-iec60870-starter</artifactId>
- <version>4.23.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-iggy-starter</artifactId>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index d036b4290bd..ab693cb1b68 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -1242,11 +1242,6 @@
<artifactId>camel-ical-starter</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-iec60870-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-iggy-starter</artifactId>
@@ -3664,11 +3659,6 @@
<artifactId>camel-ical</artifactId>
<version>4.23.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-iec60870</artifactId>
- <version>4.23.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-iggy</artifactId>
