You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ot...@apache.org on 2021/01/06 21:43:05 UTC
[plc4x] 11/17: Merge branch 'develop' of
https://github.com/apache/plc4x into develop
This is an automated email from the ASF dual-hosted git repository.
otluk pushed a commit to branch feature/plc4py
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 8622c9405598b50efac17a0ae43d7f609755f8a9
Merge: 226f61d 361bbb4
Author: ottlukas <ot...@gmail.com>
AuthorDate: Fri Sep 11 20:30:51 2020 +0200
Merge branch 'develop' of https://github.com/apache/plc4x into develop
.gitignore | 1 +
.gitlab-ci.yml | 48 -
Dockerfile | 2 +-
Jenkinsfile | 8 +-
README.md | 2 +-
RELEASE_NOTES | 68 +-
build-utils/language-base-freemarker/pom.xml | 5 +
.../BaseFreemarkerLanguageTemplateHelper.java | 757 +++++++
.../protocol/freemarker/FreemarkerException.java | 18 +-
.../freemarker/FreemarkerLanguageOutput.java | 10 +-
.../apache/plc4x/language/c/CLanguageOutput.java | 8 +-
.../plc4x/language/c/CLanguageTemplateHelper.java | 926 +++++++-
.../resources/templates/c/enum-template-c.ftlh | 79 +
.../resources/templates/c/enum-template-h.ftlh | 87 +
.../resources/templates/c/pojo-template-c.ftlh | 687 +++++-
.../resources/templates/c/pojo-template-h.ftlh | 133 +-
.../plc4x/language/java/JavaLanguageOutput.java | 4 +-
.../language/java/JavaLanguageTemplateHelper.java | 211 +-
.../resources/templates/java/data-io-template.ftlh | 100 +-
.../templates/java/enum-package-info-template.ftlh | 8 +
.../resources/templates/java/enum-template.ftlh | 71 +-
.../main/resources/templates/java/io-template.ftlh | 426 ++--
.../resources/templates/java/pojo-template.ftlh | 241 ++-
.../plugins/codegenerator/language/mspec/MSpec.g4 | 10 +-
.../definitions/DefaultDataIoTypeDefinition.java | 2 +
.../model/definitions/DefaultTypeDefinition.java | 6 +
.../mspec/model/fields/DefaultSwitchField.java | 10 +-
.../mspec/parser/MessageFormatListener.java | 21 +-
media/powered-by-plc4x.png | Bin 0 -> 99195 bytes
media/toddy-loves-apache.png | Bin 0 -> 265483 bytes
.../org/apache/plc4x/java/api/model/PlcField.java | 2 +
.../plc4x/java/api/types/PlcResponseCode.java | 4 +
.../apache/plc4x/java/api/value/PlcBigDecimal.java | 10 +-
.../apache/plc4x/java/api/value/PlcBigInteger.java | 8 +-
.../org/apache/plc4x/java/api/value/PlcByte.java | 16 -
.../org/apache/plc4x/java/api/value/PlcDouble.java | 10 +-
.../org/apache/plc4x/java/api/value/PlcFloat.java | 8 +-
.../apache/plc4x/java/api/value/PlcInteger.java | 20 +-
.../org/apache/plc4x/java/api/value/PlcLong.java | 6 +-
.../org/apache/plc4x/java/api/value/PlcNull.java | 247 +++
.../org/apache/plc4x/java/api/value/PlcShort.java | 18 +-
.../org/apache/plc4x/java/api/value/PlcString.java | 141 +-
.../org/apache/plc4x/java/api/value/PlcValues.java | 6 +-
plc4j/drivers/ads/pom.xml | 148 +-
.../org/apache/plc4x/java/ads/ADSPlcDriver.java | 48 +-
.../org/apache/plc4x/java/ads/AdsPlcDriver.java | 106 -
.../java/ads}/configuration/AdsConfiguration.java | 52 +-
.../ads/connection/AdsAbstractPlcConnection.java | 276 ---
.../java/ads/connection/AdsConnectionFactory.java | 58 -
.../ads/connection/AdsSerialPlcConnection.java | 70 -
.../java/ads/connection/AdsTcpPlcConnection.java | 374 ----
.../org/apache/plc4x/java/ads}/field/AdsField.java | 9 +-
.../plc4x/java/ads}/field/AdsFieldHandler.java | 209 +-
.../plc4x/java/ads}/field/DirectAdsField.java | 7 +-
.../plc4x/java/ads}/field/SymbolicAdsField.java | 4 +-
.../java/ads}/model/AdsSubscriptionHandle.java | 4 +-
.../plc4x/java/ads/protocol/AdsProtocolLogic.java | 697 ++++++
.../apache/plc4x/java/ads/utils/StaticHelper.java} | 24 +-
.../connection/AdsAbstractPlcConnection.java | 17 +-
.../attic}/connection/AdsConnectionFactory.java | 4 +-
.../attic}/connection/AdsSerialPlcConnection.java | 4 +-
.../attic}/connection/AdsTcpPlcConnection.java | 30 +-
.../attic}/protocol/Ads2PayloadProtocol.java | 10 +-
.../attic}/protocol/Payload2SerialProtocol.java | 22 +-
.../attic}/protocol/Payload2TcpProtocol.java | 19 +-
.../amsads/attic}/protocol/Plc4x2AdsProtocol.java | 47 +-
.../attic}/protocol/exception/AdsException.java | 2 +-
.../exception/AdsProtocolOverflowException.java | 2 +-
.../amsads/attic}/protocol/util/DigestUtil.java | 2 +-
.../attic}/protocol/util/LittleEndianDecoder.java | 8 +-
.../attic}/protocol/util/LittleEndianEncoder.java | 42 +-
.../protocol/util/SingleMessageRateLimiter.java | 2 +-
.../java/amsads/attic}/types/AdsDataType.java | 7 +-
.../services/org.apache.plc4x.java.api.PlcDriver | 2 +-
.../apache/plc4x/java/ads/AdsPlcDriverTest.java | 164 --
.../ads/adslib/ADSClientNotificationExample.java | 283 ---
.../org/apache/plc4x/java/ads/adslib/AdsLib.java | 565 -----
.../apache/plc4x/java/ads/adslib/AmsRequest.java | 51 -
.../apache/plc4x/java/ads/adslib/AmsRouter.java | 384 ----
.../org/apache/plc4x/java/ads/adslib/Output.java | 38 -
.../apache/plc4x/java/ads/adslib/package-info.java | 24 -
.../connection/AdsAbstractPlcConnectionTest.java | 344 ---
.../ads/connection/AdsConnectionFactoryTest.java | 165 --
.../ads/connection/AdsSerialPlcConnectionTest.java | 243 ---
.../ads/connection/AdsTcpPlcConnectionTests.java | 191 --
.../org/apache/plc4x/protocol/ads/AdsDriverIT.java | 15 +-
.../protocol/ads/AdsSerializerParserTest.java | 9 +-
.../plc4x/protocol/ads/HexBase64Helper.java} | 19 +-
.../plc4x/protocol/ads/ManualAdsDriverTest.java | 48 +
.../src/test/resources/testsuite/AdsDriverIT.xml | 855 ++++++++
.../testsuite/AdsParserSerializerTest.xml | 414 ++++
.../eip/readwrite/protocol/EipProtocolLogic.java | 41 +-
.../apache/plc4x/java/knxnetip/KnxNetIpDriver.java | 11 +-
.../configuration/KnxNetIpConfiguration.java | 50 +
.../knxnetip/context/KnxNetIpDriverContext.java | 132 ++
.../plc4x/java/knxnetip/ets5/Ets5Parser.java | 21 +-
.../plc4x/java/knxnetip/ets5/model/Ets5Model.java | 8 +-
.../java/knxnetip/field/KnxNetIpFieldHandler.java | 83 +
.../knxnetip/protocol/KnxNetIpProtocolLogic.java | 453 ++--
.../test/resources/testsuite/KNXNetIPTestsuite.xml | 106 +-
.../apache/plc4x/java/mock/field/MockField.java | 29 +-
.../org/apache/plc4x/java/mock/field/MockType.java | 2 +-
.../java/modbus/field/ModbusExtendedRegister.java | 67 +
.../plc4x/java/modbus/field/ModbusField.java | 20 +-
.../plc4x/java/modbus/field/ModbusFieldCoil.java | 30 +-
.../modbus/field/ModbusFieldDiscreteInput.java | 31 +-
.../java/modbus/field/ModbusFieldHandler.java | 10 +-
.../modbus/field/ModbusFieldHoldingRegister.java | 29 +-
.../modbus/field/ModbusFieldInputRegister.java | 29 +-
.../java/modbus/protocol/ModbusProtocolLogic.java | 116 +-
.../test/resources/testsuite/ModbusTestsuite.xml | 60 +-
plc4j/drivers/opcua/pom.xml | 12 +-
.../apache/plc4x/java/opcua/ManualPLC4XOpcua.java | 10 +-
.../plc4x/java/opcua/OpcuaPlcDriverTest.java | 142 +-
.../opcua/protocol/OpcuaPlcFieldHandlerTest.java | 3 +
plc4j/drivers/pom.xml | 2 +-
plc4j/drivers/s7/pom.xml | 11 +-
.../java/s7/readwrite/context/S7DriverContext.java | 9 +
.../plc4x/java/s7/readwrite/field/S7Field.java | 187 +-
.../java/s7/readwrite/field/S7PlcFieldHandler.java | 192 +-
.../java/s7/readwrite/field/S7StringField.java | 43 +
.../s7/readwrite/protocol/S7ProtocolLogic.java | 340 +--
.../apache/plc4x/java/s7/utils/StaticHelper.java | 67 +-
.../plc4x/java/s7/readwrite/field/S7FieldTest.java | 39 +
.../s7/src/test/resources/testsuite/S7DriverIT.xml | 78 +-
.../resources/testsuite/S7ParserSerializerTest.xml | 8 -
plc4j/examples/hello-integration-iotdb/pom.xml | 68 +-
.../examples/integration/iotdb/CliOptions.java | 18 +-
.../examples/integration/iotdb/IIoTDBWriter.java} | 18 +-
.../integration/iotdb/IoTDBWriterWithJDBC.java | 88 +
.../integration/iotdb/IoTDBWriterWithSession.java | 89 +
.../java/examples/integration/iotdb/PlcLogger.java | 70 +-
plc4j/examples/hello-webapp/client/pom.xml | 2 +-
.../examples/hello-webservice/README.adoc | 10 +-
.../pom.xml | 29 +-
.../java/examples/hellowebservice/CliOptions.java | 99 +
.../examples/hellowebservice/HelloWebservice.java | 169 ++
.../src/main/resources/logback.xml | 38 +
.../pom.xml | 14 +-
.../helloplc4x/subscription/CliOptions.java | 84 +
.../subscription/HelloPlc4xSubscription.java | 120 ++
.../src/main/resources/logback.xml | 39 +
.../pom.xml | 9 +-
.../java/examples/helloplc4x/write/CliOptions.java | 99 +
.../examples/helloplc4x/write/HelloPlc4xWrite.java | 90 +
.../src/main/resources/logback.xml | 39 +
plc4j/examples/hello-world-plc4x/pom.xml | 7 +
plc4j/examples/pom.xml | 20 +-
plc4j/integrations/apache-camel/pom.xml | 1 -
plc4j/integrations/apache-kafka/pom.xml | 12 +-
.../apache-nifi/nifi-plc4x-nar/pom.xml | 24 +-
.../apache-nifi/nifi-plc4x-processors/pom.xml | 6 +
.../org/apache/plc4x/nifi/BasePlc4xProcessor.java | 23 +-
.../org/apache/plc4x/nifi/Plc4xSinkProcessor.java | 50 +-
.../apache/plc4x/nifi/Plc4xSourceProcessor.java | 63 +-
plc4j/integrations/apache-nifi/pom.xml | 2 +-
plc4j/pom.xml | 39 +-
.../apache/plc4x/java/spi/ConversationContext.java | 38 +-
.../spi/GeneratedDriverByteToMessageCodec.java | 28 +-
.../apache/plc4x/java/spi/Plc4xNettyWrapper.java | 35 +-
.../spi/configuration/ConfigurationFactory.java | 9 +-
.../annotations/defaults/FloatDefaultValue.java} | 20 +-
.../exceptions/ConfigurationException.java} | 18 +-
.../plc4x/java/spi/connection/ChannelFactory.java | 2 +
.../spi/connection/DefaultNettyPlcConnection.java | 2 +-
.../connection/GeneratedProtocolMessageCodec.java | 9 +-
.../spi/connection/ProtocolStackConfigurer.java | 2 +-
.../connection/SingleProtocolStackConfigurer.java | 4 +-
.../plc4x/java/spi/discovery/ActiveDiscovery.java | 17 +-
.../java/spi/discovery/BroadcastDiscovery.java | 17 +-
.../plc4x/java/spi/discovery/PassiveDiscovery.java | 17 +-
.../java/spi/discovery/SupportsDiscovery.java} | 10 +-
.../java/spi/generation/EvaluationHelper.java | 9 +
.../plc4x/java/spi/generation/ReadBuffer.java | 23 +-
.../plc4x/java/spi/generation/StaticHelper.java | 3 +
.../java/spi/internal/DefaultContextHandler.java | 27 +-
.../spi/internal/DefaultExpectRequestContext.java | 22 +-
.../spi/internal/DefaultSendRequestContext.java | 10 +-
.../java/spi/internal/HandlerRegistration.java | 20 +
.../plc4x/java/spi/optimizer/BaseOptimizer.java | 10 +-
.../apache/plc4x/java/spi/transport/Transport.java | 1 -
.../java/utils/connectionpool/PoolKeyFactory.java | 6 +
.../utils/connectionpool/PoolKeyFactoryTest.java | 4 +
plc4j/tools/scraper/pom.xml | 14 -
.../ScraperConfigurationTriggeredImpl.java | 1 -
.../triggeredscraper/TriggeredScraperImpl.java | 10 +-
.../pcapreplay/PcapReplayChannelFactory.java | 5 +
.../rawsocket/RawSocketChannelFactory.java | 5 +
.../transport/serial/SerialChannelFactory.java | 5 +
.../java/transport/tcp/TcpChannelFactory.java | 5 +
.../java/transport/test/TestChannelFactory.java | 5 +
.../java/transport/udp/UdpChannelFactory.java | 5 +
.../netty/config/PcapReplayChannelConfig.java | 2 +-
.../rawsockets/netty/RawSocketChannelTest.java | 2 +
.../plc4x/test/driver/DriverTestsuiteRunner.java | 52 +-
.../plc4x/test/driver/model/DriverTestsuite.java | 20 +-
.../ParserSerializerTestsuiteRunner.java | 2 +
pom.xml | 53 +-
.../main/resources/protocols/abeth/ab-eth.mspec | 2 +-
protocols/{amsads => ads}/pom.xml | 6 +-
.../apache/plc4x/protocol/ads/ADSProtocol.java} | 8 +-
...e.plc4x.plugins.codegenerator.protocol.Protocol | 2 +-
.../resources/protocols/ads/ads-discovery.mspec | 56 +
.../src/main/resources/protocols/ads/ads.mspec} | 500 ++++-
...e.plc4x.plugins.codegenerator.protocol.Protocol | 38 -
.../resources/protocols/bacnetip/bacnetip.mspec | 14 +-
.../eip/src/main/resources/protocols/eip/eip.mspec | 10 +-
.../main/resources/protocols/firmata/firmata.mspec | 8 +-
.../resources/protocols/knxnetip/knxnetip.mspec | 100 +-
.../main/resources/protocols/modbus/modbus.mspec | 13 +-
protocols/pom.xml | 2 +-
.../s7/src/main/resources/protocols/s7/s7.mspec | 75 +-
.../discovery}/pom.xml | 33 +-
.../plc4x/java/discovery/DiscoveryConnection.java | 166 ++
.../plc4x/java/discovery/DiscoveryDriver.java | 52 +
.../java/discovery/DiscoveryFieldHandler.java | 12 +-
.../services/org.apache.plc4x.java.api.PlcDriver | 3 +-
sandbox/hello-influx-data-collection/pom.xml | 16 +-
sandbox/plc-simulator/pom.xml | 24 +-
.../apache/plc4x/java/s7/utils/StaticHelper.java | 67 +-
.../org/apache/plc4x/simulator/PlcSimulator.java | 57 +-
.../simulator/exceptions/SimulatorExcepiton.java | 19 +-
.../org/apache/plc4x/simulator/model/Context.java | 112 +
.../plc4x/simulator/server/ServerModule.java | 9 +-
.../apache/plc4x/simulator/server/s7/S7Server.java | 69 -
.../plc4x/simulator/server/s7/S7ServerModule.java | 72 +-
.../server/s7/protocol/S7Step7Protocol.java | 76 -
...rverProtocol.java => S7Step7ServerAdapter.java} | 128 +-
.../simulator/simulation/SimulationModule.java | 5 +-
.../watertank/WaterTankSimulationModule.java | 65 +-
sandbox/plc4c/CMakeLists.txt | 4 +-
sandbox/plc4c/api/include/plc4c/types.h | 8 +-
sandbox/plc4c/api/include/plc4c/utils/list.h | 2 +
sandbox/plc4c/drivers/modbus/CMakeLists.txt | 5 +-
sandbox/plc4c/drivers/s7/CMakeLists.txt | 27 +-
sandbox/plc4c/drivers/s7/test/s7_test.c | 234 ++
.../examples/hello-subsciptions/CMakeLists.txt | 5 +-
sandbox/plc4c/examples/hello-world/CMakeLists.txt | 11 +-
.../modbus/includes/modbus_constants.h | 56 +
.../generated-sources/modbus/includes/modbus_pdu.h | 241 +++
.../modbus_pdu_read_file_record_request_item.h | 56 +
.../modbus_pdu_read_file_record_response_item.h | 54 +
.../modbus_pdu_write_file_record_request_item.h | 56 +
.../modbus_pdu_write_file_record_response_item.h | 56 +
.../modbus/includes/modbus_serial_adu.h | 57 +
.../modbus/includes/modbus_tcp_adu.h | 60 +
.../modbus/src/modbus_constants.c | 78 +
.../generated-sources/modbus/src/modbus_pdu.c | 2261 ++++++++++++++++++++
.../src/modbus_pdu_read_file_record_request_item.c | 123 ++
.../modbus_pdu_read_file_record_response_item.c | 122 ++
.../modbus_pdu_write_file_record_request_item.c | 156 ++
.../modbus_pdu_write_file_record_response_item.c | 156 ++
.../modbus/src/modbus_serial_adu.c | 144 ++
.../generated-sources/modbus/src/modbus_tcp_adu.c | 145 ++
.../generated-sources/s7/includes/cotp_packet.h | 108 +
.../generated-sources/s7/includes/cotp_parameter.h | 91 +
.../s7/includes/cotp_protocol_class.h | 47 +
.../generated-sources/s7/includes/cotp_tpdu_size.h | 51 +
.../s7/includes/data_transport_error_code.h | 48 +
.../s7/includes/data_transport_size.h | 51 +
.../generated-sources/s7/includes/device_group.h} | 28 +-
.../generated-sources/s7/includes/memory_area.h | 53 +
.../generated-sources/s7/includes/s7_address.h | 81 +
.../generated-sources/s7/includes/s7_message.h | 95 +
.../generated-sources/s7/includes/s7_parameter.h | 99 +
.../s7/includes/s7_parameter_user_data_item.h | 81 +
.../generated-sources/s7/includes/s7_payload.h | 91 +
.../s7/includes/s7_payload_user_data_item.h | 88 +
.../s7/includes/s7_var_payload_data_item.h | 57 +
.../s7/includes/s7_var_payload_status_item.h | 54 +
.../s7/includes/s7_var_request_parameter_item.h | 75 +
.../s7/includes/szl_data_tree_item.h | 57 +
.../plc4c/generated-sources/s7/includes/szl_id.h | 57 +
.../s7/includes/szl_module_type_class.h | 46 +
.../generated-sources/s7/includes/szl_sublist.h | 61 +
.../generated-sources/s7/includes/tpkt_packet.h | 58 +
.../generated-sources/s7/includes/transport_size.h | 89 +
.../plc4c/generated-sources/s7/src/cotp_packet.c | 553 +++++
.../generated-sources/s7/src/cotp_parameter.c | 285 +++
.../s7/src/cotp_protocol_class.c} | 14 +-
.../generated-sources/s7/src/cotp_tpdu_size.c | 58 +
.../s7/src/data_transport_error_code.c} | 14 +-
.../generated-sources/s7/src/data_transport_size.c | 58 +
.../generated-sources/s7/src/device_group.c} | 14 +-
.../plc4c/generated-sources/s7/src/memory_area.c | 64 +
.../plc4c/generated-sources/s7/src/s7_address.c | 251 +++
.../plc4c/generated-sources/s7/src/s7_message.c | 375 ++++
.../plc4c/generated-sources/s7/src/s7_parameter.c | 481 +++++
.../s7/src/s7_parameter_user_data_item.c | 325 +++
.../plc4c/generated-sources/s7/src/s7_payload.c | 311 +++
.../s7/src/s7_payload_user_data_item.c | 282 +++
.../s7/src/s7_var_payload_data_item.c | 171 ++
.../s7/src/s7_var_payload_status_item.c | 72 +
.../s7/src/s7_var_request_parameter_item.c | 146 ++
.../generated-sources/s7/src/szl_data_tree_item.c | 158 ++
sandbox/plc4c/generated-sources/s7/src/szl_id.c | 106 +
.../s7/src/szl_module_type_class.c} | 14 +-
.../generated-sources/s7/src/szl_sublist.c} | 14 +-
.../plc4c/generated-sources/s7/src/tpkt_packet.c | 132 ++
.../generated-sources/s7/src/transport_size.c | 591 +++++
sandbox/plc4c/pom.xml | 2 +
sandbox/plc4c/spi/CMakeLists.txt | 27 +-
.../spi/include/plc4c/spi/evaluation_helper.h} | 28 +-
sandbox/plc4c/spi/include/plc4c/spi/read_buffer.h | 91 +
.../plc4c/spi/include/plc4c/spi/system_private.h | 2 +
sandbox/plc4c/spi/include/plc4c/spi/write_buffer.h | 87 +
.../plc4c/spi/src/evaluation_helper.c | 23 +-
sandbox/plc4c/spi/src/read_buffer.c | 609 ++++++
sandbox/plc4c/spi/src/system.c | 7 +
sandbox/plc4c/spi/src/utils/list.c | 16 +-
sandbox/plc4c/spi/src/write_buffer.c | 429 ++++
sandbox/plc4c/spi/test/read_buffer_test.c | 756 +++++++
.../plc4c/spi/system_private.h => test/spi_test.c} | 23 +-
sandbox/plc4c/spi/test/system_test.c | 14 +-
sandbox/plc4c/spi/test/write_buffer_test.c | 901 ++++++++
sandbox/pom.xml | 17 +-
sandbox/test-java-amsads-driver/README.adoc | 35 -
sandbox/test-java-amsads-driver/pom.xml | 160 --
.../java/amsads/protocol/util/package-info.java | 22 -
.../services/org.apache.plc4x.java.api.PlcDriver | 38 -
.../protocol/amsads/BenchmarkGeneratedDf1.java | 76 -
.../plc4x/protocol/amsads/BenchmarkManualDf1.java | 239 ---
.../apache/plc4x/protocol/amsads/EndToEndTest.java | 57 -
.../org/apache/plc4x/protocol/amsads/IOTest.java | 91 -
.../src/test/resources/testsuite/Df1Testsuite.xml | 101 -
...siveBacNetIpDriver.java => BacNetIpDriver.java} | 10 +-
...nfiguration.java => BacNetIpConfiguration.java} | 6 +-
...otocolLogic.java => BacNetIpProtocolLogic.java} | 14 +-
.../services/org.apache.plc4x.java.api.PlcDriver | 2 +-
.../java/bacnetip/PassiveBacNetIpDriverManual.java | 2 +-
.../org/apache/plc4x/java/df1/util/DF1Utils.java | 5 +-
sandbox/test-streampipes-plc4x-adapters/pom.xml | 38 +-
.../java/streampipes/adapters/Plc4xAdapters.java | 4 +-
.../adapters/config/ConnectWorkerConfig.java | 4 +-
.../adapters/source/bacnetip/BacNetIpAdapter.java | 32 +-
.../adapters/source/knxnetip/KnxNetIpAdapter.java | 32 +-
sandbox/test-streampipes-plc4x-processors/pom.xml | 117 +-
.../processors/Plc4xProcessorsInit.java | 14 +-
.../java/streampipes/processors/config/Config.java | 4 +-
.../ede/BacNetIpEdeDataEnrichmentController.java | 32 +-
.../enrich/knxnetip/ets5/Ets5DataEnrichment.java | 8 +-
.../ets5/Ets5DataEnrichmentController.java | 30 +-
.../ets5/Ets5DataEnrichmentParameters.java | 4 +-
.../shared/source/knxnetip/Constants.java | 1 +
src/site/asciidoc/developers/building.adoc | 23 +-
.../developers/code-gen/protocol/mspec.adoc | 6 +-
src/site/asciidoc/developers/contributing.adoc | 6 +-
.../asciidoc/developers/infrastructure/ci.adoc | 2 +-
.../asciidoc/developers/infrastructure/vm.adoc | 6 +-
.../asciidoc/developers/infrastructure/vpn.adoc | 4 +-
.../developers/infrastructure/website.adoc | 2 +-
src/site/asciidoc/developers/preparing/index.adoc | 14 +-
src/site/asciidoc/developers/preparing/linux.adoc | 4 +
.../asciidoc/developers/release/build-tools.adoc | 44 +-
src/site/asciidoc/developers/release/release.adoc | 18 +-
src/site/asciidoc/developers/team.adoc | 8 +
src/site/asciidoc/users/adopters.adoc | 57 +
src/site/asciidoc/users/commercial-support.adoc | 51 +
src/site/asciidoc/users/download.adoc | 61 +-
.../asciidoc/users/integrations/apache-iotdb.adoc | 42 +
.../asciidoc/users/integrations/apache-nifi.adoc | 135 ++
src/site/asciidoc/users/protocols/knxnetip.adoc | 85 +
src/site/asciidoc/users/protocols/modbus.adoc | 41 +-
src/site/asciidoc/users/protocols/s7.adoc | 21 +-
src/site/asciidoc/users/tools/connection-pool.adoc | 55 +
src/site/asciidoc/users/tools/scraper.adoc | 207 +-
src/site/asciidoc/users/users.adoc | 43 -
src/site/resources-filtered/plc4x-doap.rdf | 15 +-
.../images/integrations/nifi/add-processor.png | Bin 0 -> 25508 bytes
.../nifi/configure-processor-properties.png | Bin 0 -> 36219 bytes
.../integrations/nifi/configure-scheduling.png | Bin 0 -> 37276 bytes
.../images/integrations/nifi/configured-flow.png | Bin 0 -> 130333 bytes
.../integrations/nifi/configured-log-processor.png | Bin 0 -> 54626 bytes
.../nifi/configured-plc4x-source-processor.png | Bin 0 -> 41203 bytes
.../integrations/nifi/configuring-connection.png | Bin 0 -> 39490 bytes
.../images/integrations/nifi/empty-nifi-flow.png | Bin 0 -> 74244 bytes
.../integrations/nifi/list-of-plc4x-processors.png | Bin 0 -> 103175 bytes
.../images/integrations/nifi/running-flow.png | Bin 0 -> 59506 bytes
src/site/resources/images/team/cdutz.png | Bin 27791 -> 66024 bytes
src/site/resources/images/team/mstrljic.jpg | Bin 0 -> 28604 bytes
src/site/resources/images/toddy-loves-apache.png | Bin 0 -> 265483 bytes
.../images/users/companies/logo-codecentric.png | Bin 0 -> 26220 bytes
.../images/users/companies/logo-industryfusion.png | Bin 0 -> 15414 bytes
.../images/users/companies/logo-pietrorimoldi.jpg | Bin 0 -> 584330 bytes
.../users/companies/logo-pragmatic-industries.svg | 498 +++++
.../users/companies/logo-pragmatic-minds.svg | 714 +++++++
.../users/companies/logo_unistuttgart_isw.png | Bin 0 -> 31592 bytes
src/site/site.xml | 3 +-
388 files changed, 26456 insertions(+), 6932 deletions(-)