You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2018/08/02 08:13:36 UTC
[incubator-plc4x] branch feature/ethernet-ip updated (44627a3 ->
a372307)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch feature/ethernet-ip
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from 44627a3 PLC4X-38 - Implement the Ethernet/IP Protocol
add 748a39d PLC4X-40 - Refactor the PlcSubscriber to be more aligned with the PlcReader and PlcWriter
add 7079cad Changed the pom to use a variable instead of having it hard coded for every modbus driver dependency.
add e413887 refined test for modbus protocol
add 917c7fb added sanity checks for produced values and cleaned up type checks
add c4a35b3 added tests for double data type in ads
add be1703c create a blacklist of not yet supported types on modbus
add 234c121 refactored common used test code into driver-bases-test
add 6adebdf fixed calender tests and simplified assertions while at it
add 5f3d7ab removed unsused method (cleanup for 6adebdf)
add 14d5585 added BigInteger support on modbus and ads
add 9efd47c fixed documentation of test class javadoc
add 18bb3f3 modbus: fixed coil parsing
add 9e05e64 modbus protocol test: increased readability by extracting duplicate code
add 11db5b9 added byte[] and Byte[] to supported data types test
add 9221ed5 small fix in supported data types regarding byte[] and Byte[] mixup
add 5d06aa7 supported data type tests: increase readability by introducing typed class
add 947579f added support for float and double in modbus
add dbc6812 fixed upper bounds for registers.
add bd291ae added type generator function to Plc4XS7ProtocolTest
add c0b3745 added double support to S7
add d7159aa added PlcNotImplementedException to mark not yet implemented code parts.
add 810d649 fixed double implementation in S7
add d6a498e Made Jenkins use a ".repository" as local repo directory for deployment instead of the default one in an attempt to solve deployment problems on jenkins.
add 4bec0c1 Exclude the Ubuntu node H32 from the nodes used for deploying as this seems to have issues with using GIT
add f567718 Added an enforcer rule, that fails the build if any dependencies (direct and transitive) are used for which known vulnerabilities exist.
add 44c0d68 Added an enforcer rule, that fails the build if any dependencies (direct and transitive) are used for which known vulnerabilities exist.
new a372307 Merge branches 'feature/ethernet-ip' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
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:
Jenkinsfile | 6 +-
examples/kafka-bridge/pom.xml | 12 +-
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 31 +-
.../java/org/apache/plc4x/camel/ManualTest.java | 2 +-
.../java/org/apache/plc4x/camel/MockDriver.java | 57 +++-
.../plc4x/java/api/connection/PlcSubscriber.java | 24 +-
.../exceptions/PlcNotImplementedException.java} | 10 +-
.../plc4x/java/api/messages/PlcNotification.java | 80 -----
.../apache/plc4x/java/api/messages/PlcRequest.java | 2 +-
.../java/api/messages/PlcRequestContainer.java | 8 +
.../{PlcMessage.java => PlcSubscriptionEvent.java} | 21 +-
...PlcMessage.java => PlcSubscriptionRequest.java} | 9 +-
...lcMessage.java => PlcSubscriptionResponse.java} | 16 +-
.../api/messages/PlcUnsubscriptionRequest.java | 54 +++
.../PlcUnsubscriptionResponse.java} | 4 +-
.../java/api/messages/items/ReadRequestItem.java | 32 +-
.../java/api/messages/items/ReadResponseItem.java | 28 +-
.../plc4x/java/api/messages/items/RequestItem.java | 28 +-
.../java/api/messages/items/ResponseItem.java | 28 +-
.../api/messages/items/SubscriptionEventItem.java | 43 ++-
...a => SubscriptionRequestChangeOfStateItem.java} | 11 +-
.../items/SubscriptionRequestCyclicItem.java} | 28 +-
...Item.java => SubscriptionRequestEventItem.java} | 11 +-
.../messages/items/SubscriptionRequestItem.java} | 34 +-
.../messages/items/SubscriptionResponseItem.java} | 27 +-
.../messages/items/UnsubscriptionRequestItem.java | 62 ++++
.../items/UnsubscriptionResponseItem.java} | 14 +-
.../java/api/messages/items/WriteRequestItem.java | 28 +-
.../java/api/messages/items/WriteResponseItem.java | 28 +-
.../SubscriptionHandle.java} | 12 +-
.../plc4x/java/api/model/SubscriptionType.java} | 26 +-
.../ads/connection/AdsAbstractPlcConnection.java | 5 +
.../java/ads/connection/AdsTcpPlcConnection.java | 133 +++++---
.../java/ads/model/AdsSubscriptionHandle.java} | 23 +-
.../ads/protocol/util/LittleEndianDecoder.java | 12 +
.../ads/protocol/util/LittleEndianEncoder.java | 18 +
.../apache/plc4x/java/ads/ManualPlc4XAdsTest.java | 24 +-
.../ads/connection/AdsTcpPlcConnectionTests.java | 46 ++-
.../java/ads/protocol/Plc4x2AdsProtocolTest.java | 75 ++---
.../base/protocol/Plc4XSupportedDataTypes.java | 200 +++++++++++
plc4j/protocols/modbus/pom.xml | 10 +-
.../java/modbus/netty/Plc4XModbusProtocol.java | 227 ++++++++++---
.../plc4x/java/modbus/ManualPlc4XModbusTest.java | 44 ++-
.../java/modbus/netty/Plc4XModbusProtocolTest.java | 374 +++++++++++++--------
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 23 +-
.../plc4x/java/s7/netty/util/S7TypeDecoder.java | 27 +-
.../plc4x/java/s7/netty/util/S7TypeEncoder.java | 29 +-
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 55 +--
pom.xml | 24 +-
49 files changed, 1431 insertions(+), 694 deletions(-)
copy plc4j/{protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/generic/types/package-info.java => api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcNotImplementedException.java} (74%)
delete mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcNotification.java
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/{PlcMessage.java => PlcSubscriptionEvent.java} (66%)
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/{PlcMessage.java => PlcSubscriptionRequest.java} (83%)
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/{PlcMessage.java => PlcSubscriptionResponse.java} (61%)
create mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcUnsubscriptionRequest.java
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/{authentication/PlcAuthentication.java => messages/PlcUnsubscriptionResponse.java} (87%)
copy integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XConsumerTest.java => plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/SubscriptionEventItem.java (51%)
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/{WriteResponseItem.java => SubscriptionRequestChangeOfStateItem.java} (66%)
copy plc4j/{protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Address.java => api/src/main/java/org/apache/plc4x/java/api/messages/items/SubscriptionRequestCyclicItem.java} (54%)
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/{WriteResponseItem.java => SubscriptionRequestEventItem.java} (68%)
copy plc4j/api/src/{test/java/org/apache/plc4x/java/api/connection/PlcWriterTest.java => main/java/org/apache/plc4x/java/api/messages/items/SubscriptionRequestItem.java} (51%)
copy plc4j/{protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationResponse.java => api/src/main/java/org/apache/plc4x/java/api/messages/items/SubscriptionResponseItem.java} (55%)
create mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/UnsubscriptionRequestItem.java
copy plc4j/{protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteBufSupplier.java => api/src/main/java/org/apache/plc4x/java/api/messages/items/UnsubscriptionResponseItem.java} (74%)
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/{messages/PlcMessage.java => model/SubscriptionHandle.java} (60%)
copy plc4j/{protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TsapParameter.java => api/src/main/java/org/apache/plc4x/java/api/model/SubscriptionType.java} (58%)
copy plc4j/protocols/{s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/DisconnectAdditionalInformationParameter.java => ads/src/main/java/org/apache/plc4x/java/ads/model/AdsSubscriptionHandle.java} (60%)
create mode 100644 plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/protocol/Plc4XSupportedDataTypes.java
[incubator-plc4x] 01/01: Merge branches 'feature/ethernet-ip' and
'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into
feature/ethernet-ip
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/ethernet-ip
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit a372307f885eb5f083f94c863a6a2db1d07e311e
Merge: 44627a3 44c0d68
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Aug 2 10:04:23 2018 +0200
Merge branches 'feature/ethernet-ip' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/ethernet-ip
Jenkinsfile | 6 +-
examples/kafka-bridge/pom.xml | 12 +-
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 31 +-
.../java/org/apache/plc4x/camel/ManualTest.java | 2 +-
.../java/org/apache/plc4x/camel/MockDriver.java | 57 +++-
.../plc4x/java/api/connection/PlcSubscriber.java | 24 +-
.../api/exceptions/PlcNotImplementedException.java | 28 ++
.../plc4x/java/api/messages/PlcNotification.java | 80 -----
.../apache/plc4x/java/api/messages/PlcRequest.java | 2 +-
.../java/api/messages/PlcRequestContainer.java | 8 +
...ResponseItem.java => PlcSubscriptionEvent.java} | 18 +-
...sponseItem.java => PlcSubscriptionRequest.java} | 10 +-
...ponseItem.java => PlcSubscriptionResponse.java} | 13 +-
.../api/messages/PlcUnsubscriptionRequest.java | 54 +++
...nseItem.java => PlcUnsubscriptionResponse.java} | 11 +-
.../java/api/messages/items/ReadRequestItem.java | 32 +-
.../java/api/messages/items/ReadResponseItem.java | 28 +-
.../plc4x/java/api/messages/items/RequestItem.java | 28 +-
.../java/api/messages/items/ResponseItem.java | 28 +-
.../api/messages/items/SubscriptionEventItem.java | 48 +++
...a => SubscriptionRequestChangeOfStateItem.java} | 11 +-
...tem.java => SubscriptionRequestCyclicItem.java} | 25 +-
...Item.java => SubscriptionRequestEventItem.java} | 11 +-
.../messages/items/SubscriptionRequestItem.java | 45 +++
.../messages/items/SubscriptionResponseItem.java | 37 ++
.../messages/items/UnsubscriptionRequestItem.java | 62 ++++
.../messages/items/UnsubscriptionResponseItem.java | 29 ++
.../java/api/messages/items/WriteRequestItem.java | 28 +-
.../java/api/messages/items/WriteResponseItem.java | 28 +-
.../SubscriptionHandle.java} | 19 +-
.../SubscriptionType.java} | 25 +-
.../ads/connection/AdsAbstractPlcConnection.java | 5 +
.../java/ads/connection/AdsTcpPlcConnection.java | 133 +++++---
.../java/ads/model/AdsSubscriptionHandle.java} | 17 +-
.../ads/protocol/util/LittleEndianDecoder.java | 12 +
.../ads/protocol/util/LittleEndianEncoder.java | 18 +
.../apache/plc4x/java/ads/ManualPlc4XAdsTest.java | 24 +-
.../ads/connection/AdsTcpPlcConnectionTests.java | 46 ++-
.../java/ads/protocol/Plc4x2AdsProtocolTest.java | 75 ++---
.../base/protocol/Plc4XSupportedDataTypes.java | 200 +++++++++++
plc4j/protocols/modbus/pom.xml | 10 +-
.../java/modbus/netty/Plc4XModbusProtocol.java | 227 ++++++++++---
.../plc4x/java/modbus/ManualPlc4XModbusTest.java | 44 ++-
.../java/modbus/netty/Plc4XModbusProtocolTest.java | 374 +++++++++++++--------
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 23 +-
.../plc4x/java/s7/netty/util/S7TypeDecoder.java | 27 +-
.../plc4x/java/s7/netty/util/S7TypeEncoder.java | 29 +-
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 55 +--
pom.xml | 24 +-
49 files changed, 1557 insertions(+), 626 deletions(-)