You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/08/22 08:07:33 UTC

[plc4x] 01/01: Merge branches 'develop' and 'featule/kafka-connect-refactoring' of https://gitbox.apache.org/repos/asf/plc4x into featule/kafka-connect-refactoring

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch featule/kafka-connect-refactoring
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit 639c5e8090ceec4ac4d7024eed99e8c63f614868
Merge: 548d772 aefbd4f
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Aug 22 09:49:08 2019 +0200

    Merge branches 'develop' and 'featule/kafka-connect-refactoring' of https://gitbox.apache.org/repos/asf/plc4x into featule/kafka-connect-refactoring

 plc4j/examples/hello-cloud-azure/pom.xml           |  16 ++
 plc4j/examples/hello-connectivity-kafka/pom.xml    |  32 ++-
 plc4j/examples/pom.xml                             |   8 +
 plc4j/integrations/apache-karaf/pom.xml            |  20 ++
 plc4j/protocols/delta-v/pom.xml                    |  15 ++
 plc4j/protocols/driver-bases/raw-socket/pom.xml    |  11 +-
 .../base/connection/RawSocketChannelFactory.java   |  61 +++--
 .../java/base/connection/SerialChannelFactory.java |   9 +-
 .../base/connection/TcpSocketChannelFactory.java   |   3 +-
 plc4j/utils/raw-sockets/pom.xml                    |   8 +
 .../rawsockets/{ => attic}/RawEthernetSocket.java  |   3 +-
 .../utils/rawsockets/{ => attic}/RawIpSocket.java  |  25 +-
 .../rawsockets/{ => attic}/RawSocketListener.java  |   2 +-
 .../utils/rawsockets/netty/RawSocketAddress.java   |  22 +-
 .../utils/rawsockets/netty/RawSocketChannel.java   | 276 +++++++++++++++++----
 ...wSocketAddress.java => RawSocketIpAddress.java} |  26 +-
 .../rawsockets/{ => attic}/RawIpSocketTest.java    |   5 +-
 .../rawsockets/netty/RawSocketChannelTest.java     | 104 ++++++++
 pom.xml                                            |  68 +++--
 19 files changed, 571 insertions(+), 143 deletions(-)