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/27 13:58:24 UTC

[plc4x] 36/44: Merge branch 'develop' of github.com:apache/plc4x into feature/implement-logstash-integration

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

cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit dcd66aa49e1243bb6856276513c689e22fbc6c91
Merge: da4b3df aefbd4f
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Aug 22 10:04:57 2019 +0200

    Merge branch 'develop' of github.com:apache/plc4x into feature/implement-logstash-integration

 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                                            |   4 +-
 14 files changed, 446 insertions(+), 113 deletions(-)