This is an automated email from the ASF dual-hosted git repository. keinmark pushed a commit to branch PLC4X-12 in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 2f70356b7bd0fbc011f9a68902c544d8685dda26 Merge: 6f6f00a 8d1f2a5 Author: Mark Keinhörster <[email protected]> AuthorDate: Sat Jan 13 22:41:07 2018 +0100 Merge branch 'master' into PLC4X-12 DISCLAIMER | 7 + Jenkinsfile | 1 + NOTICE | 8 + integrations/apache-camel/pom.xml | 29 +- .../java/org/apache/plc4x/camel/PLC4XEndpoint.java | 10 +- .../java/org/apache/plc4x/camel/PLC4XProducer.java | 13 +- .../java/org/apache/plc4x/camel/ConstantsTest.java | 43 +- .../org/apache/plc4x/camel/PLC4XComponentTest.java | 22 +- .../org/apache/plc4x/camel/PLC4XEndpointTest.java | 52 +++ .../org/apache/plc4x/camel/PLC4XProducerTest.java | 111 ++++++ .../apache/plc4x/edgent/PlcConnectionAdapter.java | 13 +- .../org/apache/plc4x/edgent/PlcFunctionsTest.java | 14 +- .../plc4x/java/api/messages/PlcReadRequest.java | 13 +- .../apache/plc4x/java/api/messages/PlcRequest.java | 2 +- .../plc4x/java/api/messages/PlcWriteRequest.java | 16 +- .../java/api/messages/items/ReadRequestItem.java | 2 +- .../java/api/messages/items/ReadResponseItem.java | 1 - .../plc4x/java/api/messages/items/RequestItem.java | 33 +- .../java/api/messages/items/WriteRequestItem.java | 12 +- .../java/api/messages/items/WriteResponseItem.java | 1 - .../messages/specific/TypeSafePlcReadRequest.java | 1 + .../messages/specific/TypeSafePlcWriteRequest.java | 19 +- .../plc4x/java/api/connection/PlcReaderTest.java | 36 ++ .../plc4x/java/api/connection/PlcWriterTest.java | 36 ++ .../plc4x/java/api/messages/APIMessageTests.java | 56 --- .../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/s7/utils/PcapGenerator.java | 22 +- .../plc4x/java/isotp/netty/IsoTPProtocol.java | 20 +- .../plc4x/java/isotp/netty/model/tpdus/Tpdu.java | 7 +- .../java/org/apache/plc4x/java/s7/S7PlcDriver.java | 4 +- .../plc4x/java/s7/netty/Plc4XS7Protocol.java | 444 ++++++++++++--------- .../org/apache/plc4x/java/s7/netty/S7Protocol.java | 354 ++++++++-------- .../java/s7/netty/model/messages/S7Message.java | 13 +- .../netty/model/params/CpuServicesParameter.java | 4 - .../plc4x/java/isotp/netty/IsoTPProtocolTest.java | 438 +++++++++----------- .../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 +- .../apache/plc4x/java/s7/S7PlcReaderSample.java | 4 +- .../org/apache/plc4x/java/s7/S7PlcScanner.java | 4 +- .../org/apache/plc4x/java/s7/S7PlcTestConsole.java | 4 +- .../apache/plc4x/java/s7/S7PlcWriterSample.java | 4 +- .../s7/netty/model/messages/S7MessageTests.java | 8 +- pom.xml | 4 +- 55 files changed, 1787 insertions(+), 1668 deletions(-) -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
