This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch feature/PLC4X-18--raw-sockets in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 75063b2fc1d473c09c81163eee6341778df424dd Merge: df791fd 548cfd4 Author: Christofer Dutz <christofer.d...@c-ware.de> AuthorDate: Sun Jan 21 12:13:40 2018 +0100 Merge branches 'feature/PLC4X-18--raw-sockets' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/PLC4X-18--raw-sockets DISCLAIMER | 7 + Jenkinsfile | 1 + NOTICE | 8 + integrations/apache-camel/pom.xml | 29 +- .../java/org/apache/plc4x/camel/Constants.java | 6 +- .../java/org/apache/plc4x/camel/PLC4XEndpoint.java | 10 +- .../java/org/apache/plc4x/camel/PLC4XProducer.java | 34 +- .../org/apache/plc4x/camel/ConstantsTest.java} | 24 +- .../org/apache/plc4x/camel/PLC4XComponentTest.java | 25 +- .../org/apache/plc4x/camel/PLC4XEndpointTest.java | 41 +- .../org/apache/plc4x/camel/PLC4XProducerTest.java | 111 +++ .../apache/plc4x/edgent/PlcConnectionAdapter.java | 258 ++--- .../java/org/apache/plc4x/edgent/PlcFunctions.java | 4 + .../plc4x/edgent/PlcConnectionAdapterTest.java | 1030 ++++++++++---------- .../org/apache/plc4x/edgent/PlcFunctionsTest.java | 14 +- .../apache/plc4x/edgent/mock/MockConnection.java | 123 ++- .../plc4x/java/api/connection/PlcReader.java | 17 +- .../plc4x/java/api/connection/PlcWriter.java | 18 +- .../plc4x/java/api/messages/PlcReadRequest.java | 78 +- .../plc4x/java/api/messages/PlcReadResponse.java | 23 +- .../apache/plc4x/java/api/messages/PlcRequest.java | 72 +- .../plc4x/java/api/messages/PlcResponse.java | 54 +- .../plc4x/java/api/messages/PlcWriteRequest.java | 82 +- .../plc4x/java/api/messages/PlcWriteResponse.java | 23 +- .../java/api/messages/items/ReadRequestItem.java | 24 +- .../java/api/messages/items/ReadResponseItem.java | 23 +- .../{ReadRequestItem.java => RequestItem.java} | 21 +- .../{WriteResponseItem.java => ResponseItem.java} | 9 +- .../java/api/messages/items/WriteRequestItem.java | 37 +- .../java/api/messages/items/WriteResponseItem.java | 19 +- .../messages/specific/TypeSafePlcReadRequest.java | 86 ++ .../messages/specific/TypeSafePlcReadResponse.java | 83 ++ .../messages/specific/TypeSafePlcWriteRequest.java | 82 ++ .../specific/TypeSafePlcWriteResponse.java | 59 ++ .../plc4x/java/api/connection/PlcReaderTest.java | 36 + .../plc4x/java/api/connection/PlcWriterTest.java | 36 + .../plc4x/java/api/messages/APIMessageTests.java | 175 ++-- .../java/api/messages/PlcReadRequestTest.java | 88 ++ .../java/api/messages/PlcReadResponseTest.java | 45 + .../plc4x/java/api/messages/PlcRequestTest.java | 86 ++ .../plc4x/java/api/messages/PlcResponseTest.java | 87 ++ .../java/api/messages/PlcWriteRequestTest.java | 86 ++ .../java/api/messages/PlcWriteResponseTest.java | 45 + .../specific/TypeSafePlcReadRequestTest.java | 77 ++ .../specific/TypeSafePlcReadResponseTest.java | 76 ++ .../specific/TypeSafePlcWriteRequestTest.java | 77 ++ .../specific/TypeSafePlcWriteResponseTest.java | 62 ++ .../org/apache/plc4x/java/PlcDriverManager.java | 2 +- .../apache/plc4x/java/PlcDriverManagerTest.java | 52 +- .../apache/plc4x/java/s7/utils/PcapGenerator.java | 22 +- .../java/isoontcp/netty/IsoOnTcpProtocol.java | 4 +- .../plc4x/java/isotp/netty/IsoTPProtocol.java | 45 +- .../netty/model/tpdus/CustomTpdu.java} | 18 +- .../plc4x/java/isotp/netty/model/tpdus/Tpdu.java | 7 +- .../java/isotp/netty/model/types/TpduCode.java | 8 +- .../java/org/apache/plc4x/java/s7/S7PlcDriver.java | 4 +- .../plc4x/java/s7/connection/S7PlcConnection.java | 6 +- .../plc4x/java/s7/netty/Plc4XS7Protocol.java | 460 +++++---- .../org/apache/plc4x/java/s7/netty/S7Protocol.java | 356 ++++--- .../java/s7/netty/model/messages/S7Message.java | 13 +- .../netty/model/params/CpuServicesParameter.java | 4 - .../netty/model/types/DataTransportErrorCode.java | 9 +- .../java/s7/netty/model/types/ParameterType.java | 7 +- .../plc4x/java/isotp/netty/IsoTPProtocolTest.java | 460 ++++----- .../apache/plc4x/java/isotp/netty/MockChannel.java | 243 ----- .../isotp/netty/MockChannelHandlerContext.java | 234 ----- .../java/isotp/netty/MockChannelPipeline.java | 354 ------- .../isotp/netty/model/tpdus/IsotpModelTests.java | 8 +- .../isotp/netty/model/types/IsotpTypeTests.java | 5 +- .../apache/plc4x/java/s7/S7PlcReaderSample.java | 15 +- .../org/apache/plc4x/java/s7/S7PlcScanner.java | 20 +- .../org/apache/plc4x/java/s7/S7PlcTestConsole.java | 16 +- .../apache/plc4x/java/s7/S7PlcWriterSample.java | 13 +- .../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 27 +- .../s7/netty/model/messages/S7MessageTests.java | 8 +- .../org/apache/plc4x/java/utils/PcapngUtils.java | 4 + pom.xml | 4 +- .../{development => developers}/building.adoc | 2 +- .../asciidoc/{development => developers}/ci.adoc | 9 + .../{development => developers}/contributing.adoc | 0 .../contributing.adoc => developers/issues.adoc} | 3 +- .../contributing.adoc => developers/sonar.adoc} | 3 +- .../{development => developers}/website.adoc | 0 .../contributing.adoc => developers/wiki.adoc} | 3 +- src/site/asciidoc/index.adoc | 4 +- .../ci.adoc => users/gettingstarted.adoc} | 4 +- src/site/asciidoc/users/industry40.adoc | 124 +++ src/site/site.xml | 23 +- 88 files changed, 3554 insertions(+), 2560 deletions(-) -- To stop receiving notification emails like this one, please contact cd...@apache.org.