You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2018/01/11 14:40:24 UTC
[incubator-plc4x] 12/12: Merge branch 'master' into
assertj_migration
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 9b46c5ea9e4d9acd031a1a806fa970be1be1e859
Merge: a2a4d84 ea71d93
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Jan 11 15:37:38 2018 +0100
Merge branch 'master' into assertj_migration
.gitignore | 1 +
Jenkinsfile | 4 +-
applications/iotree/pom.xml | 5 +
.../plc4x/java/applications/iotree/IoTree.java | 20 +-
applications/plclogger/pom.xml | 5 +
.../java/applications/plclogger/PlcLogger.java | 20 +-
integrations/apache-camel/pom.xml | 23 +-
.../java/org/apache/plc4x/camel/Constants.java | 1 -
.../java/org/apache/plc4x/camel/PLC4XProducer.java | 23 +-
.../org/apache/plc4x/camel/PLC4XComponentTest.java | 3 +-
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 257 +++--
.../plc4x/edgent/PlcConnectionAdapterTest.java | 1030 ++++++++++----------
.../apache/plc4x/edgent/mock/MockConnection.java | 123 ++-
.../java/api/connection/AbstractPlcConnection.java | 4 -
.../plc4x/java/api/connection/PlcReader.java | 17 +-
.../plc4x/java/api/connection/PlcWriter.java | 19 +-
.../plc4x/java/api/messages/PlcReadRequest.java | 129 ++-
.../plc4x/java/api/messages/PlcReadResponse.java | 44 +-
.../plc4x/java/api/messages/PlcWriteRequest.java | 120 ++-
.../plc4x/java/api/messages/PlcWriteResponse.java | 44 +-
.../java/api/messages/items/ReadRequestItem.java | 23 +-
.../java/api/messages/items/ReadResponseItem.java | 13 +-
.../java/api/messages/items/WriteRequestItem.java | 33 +-
.../java/api/messages/items/WriteResponseItem.java | 9 +-
.../messages/specific/TypeSafePlcReadRequest.java | 84 ++
.../messages/specific/TypeSafePlcReadResponse.java | 81 ++
.../messages/specific/TypeSafePlcWriteRequest.java | 76 ++
.../specific/TypeSafePlcWriteResponse.java | 56 ++
.../PlcUsernamePasswordAuthenticationTest.java | 0
.../plc4x/java/api/messages/APIMessageTests.java | 271 +++++
.../plc4x/java/api/messages/mock/MockAddress.java | 0
.../plc4x/java/api/messages/APIMessageTests.java | 214 ----
plc4j/pom.xml | 38 +-
.../plc4x/java/isotp/netty/IsoTPProtocol.java | 388 ++++----
.../java/isotp/netty/model/types/DeviceGroup.java | 4 +-
.../isotp/netty/model/types/DisconnectReason.java | 4 +-
.../isotp/netty/model/types/ParameterCode.java | 4 +-
.../isotp/netty/model/types/ProtocolClass.java | 4 +-
.../java/isotp/netty/model/types/RejectCause.java | 4 +-
.../java/isotp/netty/model/types/TpduCode.java | 4 +-
.../java/isotp/netty/model/types/TpduSize.java | 4 +-
.../plc4x/java/s7/connection/S7PlcConnection.java | 8 +-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 161 +--
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 233 +++--
.../netty/model/types/DataTransportErrorCode.java | 4 +-
.../s7/netty/model/types/DataTransportSize.java | 4 +-
.../java/s7/netty/model/types/MemoryArea.java | 4 +-
.../java/s7/netty/model/types/MessageType.java | 4 +-
.../java/s7/netty/model/types/ParameterType.java | 4 +-
.../s7/netty/model/types/SpecificationType.java | 4 +-
.../java/s7/netty/model/types/TransportSize.java | 4 +-
.../netty/model/types/VariableAddressingMode.java | 4 +-
.../plc4x/java/isotp/netty/IsoTPProtocolTest.java | 648 +++++++++++-
.../apache/plc4x/java/isotp/netty/MockChannel.java | 243 +++++
.../isotp/netty/MockChannelHandlerContext.java | 234 +++++
.../java/isotp/netty/MockChannelPipeline.java | 354 +++++++
.../apache/plc4x/java/s7/S7PlcReaderSample.java | 17 +-
.../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 | 198 +++-
.../apache/plc4x/java/s7/netty/S7ProtocolTest.java | 62 +-
pom.xml | 263 +++--
sonar-project.properties.sav | 46 +
src/site/asciidoc/development/building.adoc | 82 ++
65 files changed, 4283 insertions(+), 1553 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.