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/17 13:58:01 UTC
[incubator-plc4x] 01/01: Merging feature/site-generation-fixes
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/site-generation-fixes
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit db00cb4d3e27e19c7f8103c8df5bcfdc60da9bff
Merge: 0be404c 276768b
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Aug 17 15:57:56 2018 +0200
Merging feature/site-generation-fixes
Jenkinsfile | 6 +-
examples/{kafka-bridge => azure}/pom.xml | 107 ++----
.../azure/iothub/S7PlcToAzureIoTHubSample.java | 95 +++++
.../dummydriver/connection/DummyConnection.java | 12 +-
.../examples/dummydriver/netty/DummyProtocol.java | 6 +-
examples/kafka-bridge/pom.xml | 12 +-
.../plc4x/java/examples/plclogger/PlcLogger.java | 2 +-
examples/plclogger/src/main/resources/logback.xml | 2 +-
examples/pom.xml | 1 +
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 9 +-
plc4j/api/pom.xml | 6 +
.../PlcNotImplementedException.java} | 17 +-
.../plc4x/java/api/messages/PlcReadRequest.java | 17 +
.../plc4x/java/api/messages/PlcReadResponse.java | 15 +
.../apache/plc4x/java/api/messages/PlcRequest.java | 6 +-
.../java/api/messages/PlcSubscriptionEvent.java | 24 ++
.../java/api/messages/PlcSubscriptionRequest.java | 55 ++-
.../java/api/messages/PlcSubscriptionResponse.java | 4 +
.../api/messages/PlcUnsubscriptionRequest.java | 80 ++++
.../api/messages/PlcUnsubscriptionResponse.java | 4 +
.../plc4x/java/api/messages/PlcWriteRequest.java | 5 +
.../plc4x/java/api/messages/PlcWriteResponse.java | 5 +
.../java/api/messages/items/ReadRequestItem.java | 19 +
.../java/api/messages/items/ReadResponseItem.java | 15 +-
.../plc4x/java/api/messages/items/RequestItem.java | 5 +
.../api/messages/items/SubscriptionEventItem.java | 34 +-
.../SubscriptionRequestChangeOfStateItem.java | 8 +-
.../items/SubscriptionRequestCyclicItem.java | 39 +-
.../items/SubscriptionRequestEventItem.java | 10 +-
.../messages/items/SubscriptionRequestItem.java | 33 +-
.../messages/items/SubscriptionResponseItem.java | 30 +-
.../java/api/messages/items/WriteRequestItem.java | 7 +
.../java/api/messages/items/WriteResponseItem.java | 4 +
.../messages/specific/TypeSafePlcReadRequest.java | 15 +
.../messages/specific/TypeSafePlcReadResponse.java | 5 +
.../messages/specific/TypeSafePlcWriteRequest.java | 7 +
.../specific/TypeSafePlcWriteResponse.java | 5 +
.../apache/plc4x/java/api/ImmutabilityTest.java | 103 ++++++
.../plc4x/java/api/connection/PlcReaderTest.java | 2 +-
.../plc4x/java/api/messages/APIMessageTests.java | 15 +
...nseTest.java => PlcProprietaryRequestTest.java} | 33 +-
.../api/messages/PlcProprietaryResponseTest.java | 53 +++
.../java/api/messages/PlcReadRequestTest.java | 2 +-
.../java/api/messages/PlcReadResponseTest.java | 2 +-
.../plc4x/java/api/messages/PlcRequestTest.java | 10 +
.../plc4x/java/api/messages/PlcResponseTest.java | 20 +-
.../api/messages/PlcSubscriptionEventTest.java | 59 +++
.../api/messages/PlcSubscriptionRequestTest.java} | 16 +-
.../api/messages/PlcSubscriptionResponseTest.java} | 21 +-
...Test.java => PlcUnsubscriptionRequestTest.java} | 63 +---
.../messages/PlcUnsubscriptionResponseTest.java} | 17 +-
.../java/api/messages/PlcWriteRequestTest.java | 4 +
.../java/api/messages/PlcWriteResponseTest.java | 6 +-
.../ads/connection/AdsAbstractPlcConnection.java | 4 +-
.../java/ads/connection/AdsTcpPlcConnection.java | 176 ++++-----
.../java/ads/model/AdsSubscriptionHandle.java | 25 ++
.../plc4x/java/ads/protocol/Plc4x2AdsProtocol.java | 1 +
.../ads/protocol/util/LittleEndianDecoder.java | 18 +
.../ads/protocol/util/LittleEndianEncoder.java | 30 ++
.../apache/plc4x/java/ads/ManualPlc4XAdsTest.java | 36 +-
.../apache/plc4x/java/ads/adslib/AmsRouter.java | 6 +-
.../connection/AdsAbstractPlcConnectionTest.java | 1 +
.../ads/connection/AdsTcpPlcConnectionTests.java | 10 +-
.../java/ads/protocol/Plc4x2AdsProtocolTest.java | 81 ++---
.../base/connection/AbstractPlcConnection.java | 2 +-
.../java/base}/messages/PlcRequestContainer.java | 42 ++-
.../base/messages/PlcRequestContainerTest.java | 84 +++++
.../java/base/connection/tcp/TcpHexDumper.java | 14 +-
.../base/protocol/Plc4XSupportedDataTypes.java | 238 ++++++++++++
.../org/apache/plc4x/java/base/util/Assert.java | 7 +-
.../plc4x/java/base/util/Junit5Backport.java | 6 +-
.../modbus/connection/BaseModbusPlcConnection.java | 6 +-
.../plc4x/java/modbus/model/CoilModbusAddress.java | 2 +-
.../model/MaskWriteRegisterModbusAddress.java | 6 +-
.../model/ReadDiscreteInputsModbusAddress.java | 2 +-
.../model/ReadHoldingRegistersModbusAddress.java | 2 +-
.../model/ReadInputRegistersModbusAddress.java | 2 +-
.../java/modbus/model/RegisterModbusAddress.java | 2 +-
.../java/modbus/netty/Plc4XModbusProtocol.java | 296 +++++++++++----
.../plc4x/java/modbus/ManualPlc4XModbusTest.java | 44 ++-
.../java/modbus/netty/Plc4XModbusProtocolTest.java | 402 ++++++++++++++-------
plc4j/protocols/s7/pom.xml | 4 +
.../plc4x/java/s7/connection/S7PlcConnection.java | 70 +++-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 35 +-
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 350 +++++++++++++++---
.../java/s7/netty/events/S7IdentifiedEvent.java} | 4 +-
.../java/s7/netty/model/messages/S7Message.java | 10 +
.../s7/netty/model/messages/S7RequestMessage.java | 5 +
.../s7/netty/model/messages/S7ResponseMessage.java | 3 +
.../netty/model/params/CpuServicesParameter.java | 25 +-
...meter.java => CpuServicesRequestParameter.java} | 11 +-
.../model/params/CpuServicesResponseParameter.java | 50 +++
.../java/s7/netty/model/params/VarParameter.java | 6 +-
.../model/params/items/S7AnyVarParameterItem.java | 15 +
.../netty/model/payloads/CpuServicesPayload.java | 71 ++++
.../java/s7/netty/model/payloads/VarPayload.java | 5 +
.../netty/model/payloads/ssls/SslDataRecord.java} | 7 +-
.../ssls/SslModuleIdentificationDataRecord.java | 66 ++++
.../types/CpuServicesParameterFunctionGroup.java | 59 +++
.../CpuServicesParameterSubFunctionGroup.java | 59 +++
.../plc4x/java/s7/netty/model/types/SslId.java | 99 +++++
.../plc4x/java/s7/netty/util/S7SizeHelper.java | 20 +
.../plc4x/java/s7/netty/util/S7TypeDecoder.java | 27 +-
.../plc4x/java/s7/netty/util/S7TypeEncoder.java | 31 +-
.../plc4x/java/s7/types/S7ControllerType.java} | 11 +-
.../org/apache/plc4x/java/s7/types/S7DataType.java | 155 ++++++++
.../java/s7/connection/S7PlcConnectionIT.java | 17 +-
.../java/s7/connection/S7PlcTestConnection.java | 35 +-
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 57 ++-
.../s7/netty/model/params/S7ParameterTests.java | 8 +-
.../plc4x/java/s7/netty/util/S7SizeHelperTest.java | 5 +-
.../apache/plc4x/java/s7/types/S7DataTypeTest.java | 57 +++
.../s7/connection/s7-cpu-functions-response.pcap | Bin 0 -> 219 bytes
pom.xml | 27 +-
src/site/asciidoc/community/conferences.adoc | 24 +-
src/site/asciidoc/community/getting-involved.adoc | 62 +++-
src/site/asciidoc/index.adoc | 59 +--
.../ads/index.adoc} | 25 +-
src/site/asciidoc/protocols/delta-v/index.adoc | 197 ++++++++++
.../protocols/delta-v/reverse-engineering.adoc | 245 +++++++++++++
.../protocols/{ => ethernet-ip}/index.adoc | 15 +-
src/site/asciidoc/protocols/features.adoc | 36 +-
src/site/asciidoc/protocols/index.adoc | 11 +-
src/site/resources/img/S7300.png | Bin 211110 -> 0 bytes
src/site/resources/img/apache_kafka_logo.png | Bin 0 -> 78411 bytes
src/site/resources/img/apache_nifi_logo.svg | 19 +
.../resources/img/community-contribute-fork.png | Bin 0 -> 195211 bytes
src/site/resources/img/iot-lab.jpg | Bin 0 -> 664977 bytes
src/site/site.xml | 9 +-
src/site/template/maven-site.vm | 2 +
130 files changed, 3954 insertions(+), 851 deletions(-)