This is an automated email from the ASF dual-hosted git repository. sruehl pushed a commit to branch feature/Beckhoff_ADS_protocol in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 07391bd7a4a10c63d6b34cfa9994834d8bc277d7 Merge: daafbcd ab7bc2d Author: Sebastian Rühl <[email protected]> AuthorDate: Wed Feb 7 17:30:28 2018 +0100 Merge remote-tracking branch 'origin/master' into feature/Beckhoff_ADS_protocol .../raw-sockets => examples/dummy-driver}/pom.xml | 54 ++++----- .../java/examples/dummydriver/DummyDriver.java | 60 ++++++++++ .../dummydriver/connection/DummyConnection.java | 129 +++++++++++++++++++++ .../examples/dummydriver/model/DummyAddress.java | 34 ++---- .../examples/dummydriver/netty/DummyProtocol.java | 67 +++++++++++ .../services/org.apache.plc4x.java.api.PlcDriver | 19 +++ {applications => examples}/iotree/pom.xml | 8 +- .../apache/plc4x/java/examples}/iotree/IoTree.java | 2 +- .../iotree}/src/main/resources/logback.xml | 0 {applications => examples}/plclogger/pom.xml | 8 +- .../plc4x/java/examples}/plclogger/PlcLogger.java | 2 +- .../plclogger}/src/main/resources/logback.xml | 0 {applications => examples}/pom.xml | 7 +- .../plc4x/java/api/connection/PlcReader.java | 1 + .../plc4x/java/api/connection/PlcWriter.java | 2 +- .../messages/specific/TypeSafePlcReadResponse.java | 2 +- .../specific/TypeSafePlcWriteResponse.java | 2 +- .../plc4x/java/s7/netty/Plc4XS7Protocol.java | 4 +- plc4j/utils/raw-sockets/pom.xml | 17 +-- .../plc4x/java/utils/rawsockets/RawSocket.java | 12 +- .../utils/rawsockets/netty/RawSocketAddress.java | 34 ++---- .../utils/rawsockets/netty/RawSocketChannel.java | 100 ++++++++++++++++ pom.xml | 25 ++-- src/site/asciidoc/developers/ci.adoc | 2 +- .../{developers/ci.adoc => users/security.adoc} | 12 +- src/site/resources/css/site.css | 4 + src/site/site.xml | 16 ++- 27 files changed, 491 insertions(+), 132 deletions(-) -- To stop receiving notification emails like this one, please contact [email protected].
