You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ke...@apache.org on 2017/12/31 09:23:29 UTC
[incubator-plc4x] branch PLC4X-12 updated (7e38acd -> 3be1fc5)
This is an automated email from the ASF dual-hosted git repository.
keinmark pushed a change to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from 7e38acd WIP PLC4X-12: add license to PlcItems
add efbc73c move API message tests to correct location
add aa993bb move API message tests to correct location
add d8e5584 clean up test
add bdaa5fb clean up tests
add 43e871c remove unneeded asserts
add 1dc888c remove unneeded imports
add c873aae remove unneeded imports
add 772554f remove unneeded imports
add 5915fe0 final before static
add af886eb remove unneeded import
add f2b0d77 add final where needed
add b88ea5f remove unneeded imports
add 6f56b52 no need for cast
add 6fa05fa add a few more tests
add ce1f208 add payload test
add 5af2d71 some more tests for coverage
add 3d1d195 added parameter test
add 039677c add a simple authenication test
add cbca3a3 add ASF header
add bcd1cea missing break
add a667e0e Cleanup camel component: - Fixed shutdown - Async call in test - Added path variable for driver
add c46f6e7 Bugfix: authenticated connection isn't connected by default
add a79535d - Fixed a potential bug Justin found (We were incrementing the array one byte too much).
add ddd71cb - Added some initial content to the how to build plc4x section of the website.
add bbbbed4 - Increased the size of the video preview.
add 15baa1c Merge branch 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x
add 52c0c2d add some mocks (mostly auto generated)
add 9b5a254 add some more tests
add 29098a8 looks like size of header was off - can someone double check
add 4c6f9bd - Added some comment to the getHeaderLenght method.
new 3be1fc5 Merge branch 'master' into PLC4X-12
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/plc4x/camel/PLC4XEndpoint.java | 9 +
.../java/org/apache/plc4x/camel/PLC4XProducer.java | 60 ++--
.../org/apache/plc4x/camel/PLC4XComponentTest.java | 6 +-
.../java/api/messages/PlcRequestContainer.java | 4 +-
.../PlcUsernamePasswordAuthenticationTest.java} | 18 +-
.../plc4x/java/api/messages}/APIMessageTests.java | 27 +-
.../plc4x/java/api/messages}/mock/MockAddress.java | 2 +-
.../org/apache/plc4x/java/PlcDriverManager.java | 10 +-
.../apache/plc4x/java/PlcDriverManagerTest.java | 4 +
.../org/apache/plc4x/java/mock/MockConnection.java | 17 +-
.../java/isoontcp/netty/IsoOnTcpProtocol.java | 4 +-
.../plc4x/java/isotp/netty/IsoTPProtocol.java | 17 +-
.../plc4x/java/isotp/netty/model/IsoTPMessage.java | 2 +-
.../netty/model/params/TpduSizeParameter.java | 2 +-
.../isotp/netty/model/params/TsapParameter.java | 6 +-
.../plc4x/java/isotp/netty/model/tpdus/Tpdu.java | 4 +-
.../java/isotp/netty/model/types/DeviceGroup.java | 2 +-
.../isotp/netty/model/types/DisconnectReason.java | 2 +-
.../isotp/netty/model/types/ParameterCode.java | 2 +-
.../isotp/netty/model/types/ProtocolClass.java | 2 +-
.../java/isotp/netty/model/types/RejectCause.java | 2 +-
.../java/isotp/netty/model/types/TpduCode.java | 2 +-
.../java/isotp/netty/model/types/TpduSize.java | 2 +-
.../java/org/apache/plc4x/java/netty/Message.java | 2 +-
.../plc4x/java/netty/events/S7ConnectionEvent.java | 2 +-
.../plc4x/java/s7/connection/S7PlcConnection.java | 3 +-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 10 +-
.../java/s7/netty/model/params/VarParameter.java | 1 -
.../s7/netty/model/types/DataTransportSize.java | 4 +-
.../s7/netty/model/types/HeaderErrorClass.java | 2 +-
.../java/s7/netty/model/types/MemoryArea.java | 2 +-
.../java/s7/netty/model/types/ParameterError.java | 2 +-
.../java/s7/netty/model/types/ParameterType.java | 2 +-
.../s7/netty/model/types/SpecificationType.java | 2 +-
.../java/s7/netty/model/types/TransportSize.java | 2 +-
.../netty/model/types/VariableAddressingMode.java | 2 +-
.../plc4x/java/isotp/netty/IsoTPProtocolTest.java | 332 +++++++++++++++++++-
.../apache/plc4x/java/isotp/netty/MockChannel.java | 225 ++++++++++++++
.../isotp/netty/MockChannelHandlerContext.java | 216 +++++++++++++
.../java/isotp/netty/MockChannelPipeline.java | 336 +++++++++++++++++++++
.../isotp/netty/model/params/ParameterTests.java | 12 -
.../isotp/netty/model/tpdus/IsotpModelTests.java | 35 ++-
.../isotp/netty/model/types/IsotpTypeTests.java | 7 -
.../org/apache/plc4x/java/s7/S7PlcTestConsole.java | 2 -
.../java/s7/connection/S7PlcConnectionTests.java | 2 -
.../s7/netty/model/messages/S7MessageTests.java | 101 ++++++-
.../s7/netty/model/params/S7ParameterTests.java | 1 -
.../s7/netty/model/payloads/S7PayloadTests.java | 1 -
.../java/s7/netty/model/types/S7TypeTests.java | 34 +++
src/site/asciidoc/development/building.adoc | 82 +++++
50 files changed, 1489 insertions(+), 139 deletions(-)
copy plc4j/{protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/S7ProtocolTest.java => api/src/test/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthenticationTest.java} (64%)
rename {integrations/apache-edgent/src/test/java/org/apache/plc4x/java/api/messages/items => plc4j/api/src/test/org/apache/plc4x/java/api/messages}/APIMessageTests.java (91%)
copy {integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent => plc4j/api/src/test/org/apache/plc4x/java/api/messages}/mock/MockAddress.java (96%)
create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/MockChannel.java
create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/MockChannelHandlerContext.java
create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/MockChannelPipeline.java
--
To stop receiving notification emails like this one, please contact
['"commits@plc4x.apache.org" <co...@plc4x.apache.org>'].
[incubator-plc4x] 01/01: Merge branch 'master' into PLC4X-12
Posted by ke...@apache.org.
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 3be1fc562652eaa5638079d72cfb7a04bb2fae19
Merge: 7e38acd 4c6f9bd
Author: Mark Keinhörster <ma...@codecentric.de>
AuthorDate: Sun Dec 31 10:22:05 2017 +0100
Merge branch 'master' into PLC4X-12
.../java/org/apache/plc4x/camel/PLC4XEndpoint.java | 9 +
.../java/org/apache/plc4x/camel/PLC4XProducer.java | 60 ++--
.../org/apache/plc4x/camel/PLC4XComponentTest.java | 6 +-
.../java/api/messages/PlcRequestContainer.java | 4 +-
.../PlcUsernamePasswordAuthenticationTest.java} | 18 +-
.../plc4x/java/api/messages}/APIMessageTests.java | 27 +-
.../plc4x/java/api/messages/mock/MockAddress.java} | 49 +--
.../org/apache/plc4x/java/PlcDriverManager.java | 10 +-
.../apache/plc4x/java/PlcDriverManagerTest.java | 4 +
.../org/apache/plc4x/java/mock/MockConnection.java | 17 +-
.../java/isoontcp/netty/IsoOnTcpProtocol.java | 4 +-
.../plc4x/java/isotp/netty/IsoTPProtocol.java | 17 +-
.../plc4x/java/isotp/netty/model/IsoTPMessage.java | 2 +-
.../netty/model/params/TpduSizeParameter.java | 2 +-
.../isotp/netty/model/params/TsapParameter.java | 6 +-
.../plc4x/java/isotp/netty/model/tpdus/Tpdu.java | 4 +-
.../java/isotp/netty/model/types/DeviceGroup.java | 2 +-
.../isotp/netty/model/types/DisconnectReason.java | 2 +-
.../isotp/netty/model/types/ParameterCode.java | 2 +-
.../isotp/netty/model/types/ProtocolClass.java | 2 +-
.../java/isotp/netty/model/types/RejectCause.java | 2 +-
.../java/isotp/netty/model/types/TpduCode.java | 2 +-
.../java/isotp/netty/model/types/TpduSize.java | 2 +-
.../java/org/apache/plc4x/java/netty/Message.java | 2 +-
.../plc4x/java/netty/events/S7ConnectionEvent.java | 2 +-
.../plc4x/java/s7/connection/S7PlcConnection.java | 3 +-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 10 +-
.../java/s7/netty/model/params/VarParameter.java | 1 -
.../s7/netty/model/types/DataTransportSize.java | 4 +-
.../s7/netty/model/types/HeaderErrorClass.java | 2 +-
.../java/s7/netty/model/types/MemoryArea.java | 2 +-
.../java/s7/netty/model/types/ParameterError.java | 2 +-
.../java/s7/netty/model/types/ParameterType.java | 2 +-
.../s7/netty/model/types/SpecificationType.java | 2 +-
.../java/s7/netty/model/types/TransportSize.java | 2 +-
.../netty/model/types/VariableAddressingMode.java | 2 +-
.../plc4x/java/isotp/netty/IsoTPProtocolTest.java | 332 +++++++++++++++++++-
.../apache/plc4x/java/isotp/netty/MockChannel.java | 225 ++++++++++++++
.../isotp/netty/MockChannelHandlerContext.java | 216 +++++++++++++
.../java/isotp/netty/MockChannelPipeline.java | 336 +++++++++++++++++++++
.../isotp/netty/model/params/ParameterTests.java | 12 -
.../isotp/netty/model/tpdus/IsotpModelTests.java | 35 ++-
.../isotp/netty/model/types/IsotpTypeTests.java | 7 -
.../org/apache/plc4x/java/s7/S7PlcTestConsole.java | 2 -
.../java/s7/connection/S7PlcConnectionTests.java | 2 -
.../s7/netty/model/messages/S7MessageTests.java | 101 ++++++-
.../s7/netty/model/params/S7ParameterTests.java | 1 -
.../s7/netty/model/payloads/S7PayloadTests.java | 1 -
.../java/s7/netty/model/types/S7TypeTests.java | 34 +++
src/site/asciidoc/development/building.adoc | 82 +++++
50 files changed, 1519 insertions(+), 156 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.