Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "iec60870-client",
"title": "IEC 60870 Client",
"description": "IEC 60870 supervisory control and data acquisition (SCADA) client using NeoSCADA implementation.",
"deprecated": false,
"deprecated": true,
"firstVersion": "2.20.0",
"label": "iot",
"javaType": "org.apache.camel.component.iec60870.client.ClientComponent",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "iec60870-server",
"title": "IEC 60870 Server",
"description": "IEC 60870 supervisory control and data acquisition (SCADA) server using NeoSCADA implementation.",
"deprecated": false,
"deprecated": true,
"firstVersion": "2.20.0",
"label": "iot",
"javaType": "org.apache.camel.component.iec60870.server.ServerComponent",
Expand Down
2 changes: 1 addition & 1 deletion components/camel-iec60870/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<artifactId>camel-iec60870</artifactId>
<packaging>jar</packaging>
<name>Camel :: IEC 60870</name>
<name>Camel :: IEC 60870 (deprecated)</name>
<description>Camel IEC 60870-5-104 support</description>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "iec60870-client",
"title": "IEC 60870 Client",
"description": "IEC 60870 supervisory control and data acquisition (SCADA) client using NeoSCADA implementation.",
"deprecated": false,
"deprecated": true,
"firstVersion": "2.20.0",
"label": "iot",
"javaType": "org.apache.camel.component.iec60870.client.ClientComponent",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "iec60870-server",
"title": "IEC 60870 Server",
"description": "IEC 60870 supervisory control and data acquisition (SCADA) server using NeoSCADA implementation.",
"deprecated": false,
"deprecated": true,
"firstVersion": "2.20.0",
"label": "iot",
"javaType": "org.apache.camel.component.iec60870.server.ServerComponent",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ components=iec60870-client iec60870-server
groupId=org.apache.camel
artifactId=camel-iec60870
version=4.21.0-SNAPSHOT
projectName=Camel :: IEC 60870
projectName=Camel :: IEC 60870 (deprecated)
projectDescription=Camel IEC 60870-5-104 support
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
= IEC 60870 Client Component
= IEC 60870 Client Component (deprecated)
:doctitle: IEC 60870 Client
:shortname: iec60870-client
:artifactid: camel-iec60870
:description: IEC 60870 supervisory control and data acquisition (SCADA) client using NeoSCADA implementation.
:since: 2.20
:supportlevel: Stable
:supportlevel: Stable-deprecated
:deprecated: *deprecated*
:tabs-sync-option:
:component-header: Both producer and consumer are supported
//Manually maintained attributes
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
= IEC 60870 Server Component
= IEC 60870 Server Component (deprecated)
:doctitle: IEC 60870 Server
:shortname: iec60870-server
:artifactid: camel-iec60870
:description: IEC 60870 supervisory control and data acquisition (SCADA) server using NeoSCADA implementation.
:since: 2.20
:supportlevel: Stable
:supportlevel: Stable-deprecated
:deprecated: *deprecated*
:tabs-sync-option:
:component-header: Both producer and consumer are supported
//Manually maintained attributes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "4.21")
public abstract class AbstractConnectionMultiplexor {

private static final Logger LOG = LoggerFactory.getLogger(AbstractConnectionMultiplexor.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

import static java.util.Objects.requireNonNull;

@Deprecated(since = "4.21")
public abstract class AbstractIecComponent<T1, T2 extends BaseOptions<T2>> extends DefaultComponent {

private static final Logger LOG = LoggerFactory.getLogger(AbstractIecComponent.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

import static java.util.Objects.requireNonNull;

@Deprecated(since = "4.21")
public abstract class AbstractIecEndpoint<T extends AbstractConnectionMultiplexor> extends DefaultEndpoint {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.eclipse.neoscada.protocol.iec60870.ProtocolOptions;

@UriParams
@Deprecated(since = "4.21")
public abstract class BaseOptions<T extends BaseOptions<T>> {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.util.Objects;

@Deprecated(since = "4.21")
public class ConnectionId {
private final String host;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import org.apache.camel.spi.Metadata;

@Deprecated(since = "4.21")
public interface Constants {

String SCHEME_SERVER = "iec60870-server";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "4.21")
public class DiscardAckChannelHandler extends ChannelInboundHandlerAdapter {

private static final Logger LOG = LoggerFactory.getLogger(DiscardAckChannelHandler.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.eclipse.neoscada.protocol.iec60870.server.Server;
import org.eclipse.neoscada.protocol.iec60870.server.ServerModule;

@Deprecated(since = "4.21")
public class DiscardAckModule implements ClientModule, ServerModule {
@Override
public void initializeChannel(final SocketChannel channel, final MessageChannel messageChannel) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.eclipse.neoscada.protocol.iec60870.asdu.types.ASDUAddress;
import org.eclipse.neoscada.protocol.iec60870.asdu.types.InformationObjectAddress;

@Deprecated(since = "4.21")
public class ObjectAddress {
int[] address;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.eclipse.neoscada.protocol.iec60870.client.data.DataModuleOptions;

@Component("iec60870-client")
@Deprecated(since = "4.21")
public class ClientComponent extends AbstractIecComponent<ClientConnectionMultiplexor, ClientOptions> {

public ClientComponent(final CamelContext context) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "4.21")
public class ClientConnection {

private static final Logger LOG = LoggerFactory.getLogger(ClientConnection.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import org.apache.camel.component.iec60870.AbstractConnectionMultiplexor;

@Deprecated(since = "4.21")
public class ClientConnectionMultiplexor extends AbstractConnectionMultiplexor {

private final ClientConnection connection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.eclipse.neoscada.protocol.iec60870.asdu.types.QualityInformation;
import org.eclipse.neoscada.protocol.iec60870.asdu.types.Value;

@Deprecated(since = "4.21")
public class ClientConsumer extends DefaultConsumer {

private final ClientConnection connection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
*/
@UriEndpoint(firstVersion = "2.20.0", scheme = SCHEME_CLIENT, syntax = "iec60870-client:uriPath",
title = "IEC 60870 Client", category = { Category.IOT }, headersClass = Constants.class)
@Deprecated(since = "4.21")
public class ClientEndpoint extends AbstractIecEndpoint<ClientConnectionMultiplexor> {

public ClientEndpoint(final String uri, final DefaultComponent component, final ClientConnectionMultiplexor connection,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.eclipse.neoscada.protocol.iec60870.client.data.DataModuleOptions;

@UriParams
@Deprecated(since = "4.21")
public class ClientOptions extends BaseOptions<ClientOptions> {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.eclipse.neoscada.protocol.iec60870.asdu.types.InformationObjectAddress;
import org.eclipse.neoscada.protocol.iec60870.asdu.types.QualifierOfInterrogation;

@Deprecated(since = "4.21")
public class ClientProducer extends DefaultProducer {

private final ClientConnection connection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.eclipse.neoscada.protocol.iec60870.server.data.DataModuleOptions;

@Component("iec60870-server")
@Deprecated(since = "4.21")
public class ServerComponent extends AbstractIecComponent<ServerConnectionMultiplexor, ServerOptions> {

public ServerComponent(final CamelContext context) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import org.apache.camel.component.iec60870.AbstractConnectionMultiplexor;

@Deprecated(since = "4.21")
public class ServerConnectionMultiplexor extends AbstractConnectionMultiplexor {

private final ServerInstance server;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated(since = "4.21")
public class ServerConsumer extends DefaultConsumer {

private static final Logger LOG = LoggerFactory.getLogger(ServerConsumer.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
*/
@UriEndpoint(firstVersion = "2.20.0", scheme = SCHEME_SERVER, syntax = "iec60870-server:uriPath",
title = "IEC 60870 Server", category = { Category.IOT }, headersClass = Constants.class)
@Deprecated(since = "4.21")
public class ServerEndpoint extends AbstractIecEndpoint<ServerConnectionMultiplexor> {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

import static java.util.Arrays.asList;

@Deprecated(since = "4.21")
public class ServerInstance {
private static final Logger LOG = LoggerFactory.getLogger(ServerInstance.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.eclipse.neoscada.protocol.iec60870.server.data.DataModuleOptions;

@UriParams
@Deprecated(since = "4.21")
public class ServerOptions extends BaseOptions<ServerOptions> {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.camel.support.DefaultProducer;
import org.eclipse.neoscada.protocol.iec60870.asdu.types.Value;

@Deprecated(since = "4.21")
public class ServerProducer extends DefaultProducer {

private final ServerEndpoint endpoint;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ Two new endpoint options have been added to control the pull fetch loop:
* `pullBatchSize` (default `10`) — maximum number of messages to fetch per pull request.
* `pullFetchTimeout` (default `1000` ms) — maximum time to wait for a batch on each fetch.

=== Deprecation of camel-ironmq
=== Deprecation of camel-ironmqThe library used had no stable release since 2007. There is no Java library very active for this protocol.

The component camel-ironmq is deprecated. The official library used has been unmaintained since 2017
All the other client libraries (in other languages) are unmaintained since the same amount of time.
Expand All @@ -303,3 +303,8 @@ The component camel-digitalocean is deprecated. The java library used has been u
=== Deprecation of camel-irc

The component camel-irc is deprecated. The library used had no stable release since 2007. There is no Java library very active for this protocol.

=== Deprecation of camel-iec-60870

The component camel-iec-60870 is deprecated. The library used to implement it NeoScada is no more maintained since 2021. There are no alternatives in Java with compatible license.

Original file line number Diff line number Diff line change
Expand Up @@ -7881,6 +7881,7 @@ public static WatsonxDataEndpointBuilderFactory.WatsonxDataEndpointBuilder ibmWa
* @param path uriPath
* @return the dsl builder
*/
@Deprecated
public static ClientEndpointBuilderFactory.ClientEndpointBuilder iec60870Client(String path) {
return iec60870Client("iec60870-client", path);
}
Expand All @@ -7903,6 +7904,7 @@ public static ClientEndpointBuilderFactory.ClientEndpointBuilder iec60870Client(
* @param path uriPath
* @return the dsl builder
*/
@Deprecated
public static ClientEndpointBuilderFactory.ClientEndpointBuilder iec60870Client(String componentName, String path) {
return ClientEndpointBuilderFactory.endpointBuilder(componentName, path);
}
Expand All @@ -7923,6 +7925,7 @@ public static ClientEndpointBuilderFactory.ClientEndpointBuilder iec60870Client(
* @param path uriPath
* @return the dsl builder
*/
@Deprecated
public static ServerEndpointBuilderFactory.ServerEndpointBuilder iec60870Server(String path) {
return iec60870Server("iec60870-server", path);
}
Expand All @@ -7945,6 +7948,7 @@ public static ServerEndpointBuilderFactory.ServerEndpointBuilder iec60870Server(
* @param path uriPath
* @return the dsl builder
*/
@Deprecated
public static ServerEndpointBuilderFactory.ServerEndpointBuilder iec60870Server(String componentName, String path) {
return ServerEndpointBuilderFactory.endpointBuilder(componentName, path);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1687,6 +1687,7 @@ public interface ClientBuilders {
*
* @return the dsl builder for the headers' name.
*/
@Deprecated
default ClientHeaderNameBuilder iec60870Client() {
return ClientHeaderNameBuilder.INSTANCE;
}
Expand All @@ -1707,6 +1708,7 @@ default ClientHeaderNameBuilder iec60870Client() {
* @param path uriPath
* @return the dsl builder
*/
@Deprecated
default ClientEndpointBuilder iec60870Client(String path) {
return ClientEndpointBuilderFactory.endpointBuilder("iec60870-client", path);
}
Expand All @@ -1729,6 +1731,7 @@ default ClientEndpointBuilder iec60870Client(String path) {
* @param path uriPath
* @return the dsl builder
*/
@Deprecated
default ClientEndpointBuilder iec60870Client(String componentName, String path) {
return ClientEndpointBuilderFactory.endpointBuilder(componentName, path);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1777,6 +1777,7 @@ public interface ServerBuilders {
*
* @return the dsl builder for the headers' name.
*/
@Deprecated
default ServerHeaderNameBuilder iec60870Server() {
return ServerHeaderNameBuilder.INSTANCE;
}
Expand All @@ -1797,6 +1798,7 @@ default ServerHeaderNameBuilder iec60870Server() {
* @param path uriPath
* @return the dsl builder
*/
@Deprecated
default ServerEndpointBuilder iec60870Server(String path) {
return ServerEndpointBuilderFactory.endpointBuilder("iec60870-server", path);
}
Expand All @@ -1819,6 +1821,7 @@ default ServerEndpointBuilder iec60870Server(String path) {
* @param path uriPath
* @return the dsl builder
*/
@Deprecated
default ServerEndpointBuilder iec60870Server(String componentName, String path) {
return ServerEndpointBuilderFactory.endpointBuilder(componentName, path);
}
Expand Down