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 2020/03/19 20:00:38 UTC
[plc4x] 01/02: Merge branches 'develop' and
'feature/driver-testsuite' of https://gitbox.apache.org/repos/asf/plc4x
into feature/driver-testsuite
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/driver-testsuite
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit fcc5d8a487d4db85db9355f6b3709773cda095c0
Merge: f821ccb 0e3e593
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Mar 19 20:21:23 2020 +0100
Merge branches 'develop' and 'feature/driver-testsuite' of https://gitbox.apache.org/repos/asf/plc4x into feature/driver-testsuite
.gitignore | 4 +
.../language/java/JavaLanguageTemplateHelper.java | 26 +
.../resources/templates/java/pojo-template.ftlh | 18 +-
build-utils/pom.xml | 14 +
build-utils/protocol-base-mspec/pom.xml | 20 -
.../plc4x/java/api/messages/PlcReadResponse.java | 2 +
.../java/api/model/PlcSubscriptionHandle.java | 1 +
.../plc4x/java/api/value/PlcSimpleValue.java | 13 +
.../apache/plc4x/java/PlcDriverManagerTest.java | 24 +-
.../PlcUsernamePasswordAuthenticationTest.java | 14 +-
.../plc4x/java/api/connection/PlcReaderTest.java | 3 -
.../plc4x/java/api/connection/PlcWriterTest.java | 1 -
.../exceptions/PlcInvalidFieldExceptionTest.java | 2 +-
.../api/messages/PlcProprietaryRequestTest.java | 6 -
.../api/messages/PlcProprietaryResponseTest.java | 3 -
.../java/api/messages/PlcReadRequestTest.java | 3 -
.../java/api/messages/PlcReadResponseTest.java | 2 -
.../plc4x/java/api/messages/PlcRequestTest.java | 6 -
.../api/messages/PlcSubscriptionEventTest.java | 3 -
.../api/messages/PlcSubscriptionRequestTest.java | 2 -
.../api/messages/PlcSubscriptionResponseTest.java | 2 -
.../api/messages/PlcUnsubscriptionRequestTest.java | 4 -
.../messages/PlcUnsubscriptionResponseTest.java | 2 -
.../java/api/messages/PlcWriteRequestTest.java | 3 -
.../java/api/messages/PlcWriteResponseTest.java | 2 -
.../specific/TypeSafePlcReadRequestTest.java | 3 -
.../specific/TypeSafePlcWriteRequestTest.java | 3 -
.../java/api/types/PlcClientDatatypeTest.java | 2 +-
.../plc4x/java/api/types/PlcResponseCodeTest.java | 2 +-
.../java/api/types/PlcSubscriptionTypeTest.java | 2 +-
.../apache/plc4x/java/api/value/PlcValuesTest.java | 5 +-
.../org/apache/plc4x/java/abeth/AbEthDriver.java | 16 +
plc4j/drivers/firmata/README.adoc | 31 +
.../drivers/firmata}/pom.xml | 54 +-
.../java/firmata/readwrite/FirmataDriver.java | 162 +
.../configuration/FirmataConfiguration.java} | 19 +-
.../readwrite/context/FirmataDriverContext.java | 158 +
.../firmata/readwrite/field/FirmataField.java} | 14 +-
.../readwrite/field/FirmataFieldAnalog.java | 46 +
.../readwrite/field/FirmataFieldDigital.java | 69 +
.../readwrite/field/FirmataFieldHandler.java} | 72 +-
.../readwrite/model/FirmataSubscriptionHandle.java | 79 +
.../readwrite/protocol/FirmataProtocolLogic.java | 300 ++
.../java/firmata/readwrite/utils/FirmataUtils.java | 54 +
.../services/org.apache.plc4x.java.api.PlcDriver} | 3 +-
.../readwrite/FirmataParserSerializerTest.java} | 8 +-
.../testsuite/FirmataParserSerializerTest.xml | 286 ++
.../src/test/resources/testsuite/recording.txt | 4239 ++++++++++++++++++++
plc4j/drivers/knxnetip/pom.xml | 21 +
.../configuration/KnxNetIpConfiguration.java | 16 +-
.../plc4x/java/knxnetip/ets5/Ets5Parser.java | 5 -
.../knxnetip/protocol/KnxNetIpProtocolLogic.java | 336 +-
.../apache/plc4x/java/knxnetip/ManualKnxNetIp.java | 5 +-
plc4j/drivers/mock/pom.xml | 10 +-
.../java/mock/connection/tcp/TcpHexDumper.java | 5 +-
.../mock/protocol/Plc4XSupportedDataTypes.java | 2 +-
.../org/apache/plc4x/java/mock/util/Assert.java | 2 +-
.../java/modbus/config/ModbusConfiguration.java | 2 +-
.../plc4x/java/modbus/field/ModbusField.java | 1 +
.../plc4x/java/modbus/field/ModbusFieldCoil.java | 1 +
.../java/modbus/field/ModbusFieldHandler.java | 13 +-
.../modbus/field/ModbusFieldMaskWriteRegister.java | 98 -
.../java/modbus/field/ModbusFieldRegister.java | 47 -
.../java/modbus/protocol/ModbusProtocolLogic.java | 11 +
.../opcua/connection/OpcuaTcpPlcConnection.java | 32 +-
.../plc4x/java/opcua/protocol/OpcuaField.java | 2 +-
.../plc4x/java/opcua/OpcuaPlcDriverTest.java | 6 +-
.../org/apache/plc4x/java/opcua/UtilsTest.java | 3 +-
.../connection/OpcuaTcpPlcConnectionTest.java | 6 +-
.../plc4x/java/opcua/protocol/OpcuaFieldTest.java | 7 +
plc4j/drivers/pom.xml | 1 +
plc4j/drivers/s7/pom.xml | 35 +-
.../readwrite/configuration/S7Configuration.java | 8 +-
.../{S7DriverTestsuite.java => S7DriverIT.java} | 6 +-
...rTestsuite.java => S7ParserSerializerTest.java} | 6 +-
.../{S7DriverTestsuite.xml => S7DriverIT.xml} | 0
...zerTestsuite.xml => S7ParserSerializerTest.xml} | 0
.../simulated/connection/SimulatedDeviceTest.java | 2 +-
.../java/simulated/field/SimulatedFieldTest.java | 2 +-
.../examples/hello-influx-data-collection/pom.xml | 19 +
plc4j/examples/hello-webapp/client/asconfig.json | 20 +
plc4j/examples/hello-webapp/client/pom.xml | 35 +-
.../src/main/resources/plc4x-index-template.html | 28 +
.../hello-webapp/client/src/main/royale/App.mxml | 161 +
.../client/src/main/royale/HelloPLC4X.mxml | 104 -
.../client/src/main/royale/service/RobotService.as | 92 -
plc4j/examples/hello-webapp/pom.xml | 5 +-
plc4j/examples/hello-webapp/service/pom.xml | 55 -
.../robot/controllers/RobotController.java | 109 -
plc4j/examples/hello-webapp/webapp/pom.xml | 84 +-
.../examples/{robot => watertank}/Application.java | 2 +-
.../watertank/service/WaterTankService.java | 187 +
.../java/org/springframework/core/JdkVersion.java} | 17 +-
.../resources/META-INF/flex/services-config.xml | 98 +
.../src/main/resources/application.properties | 6 +-
.../webapp/src/main/webapp/WEB-INF/web.xml | 79 +
.../webapp/src/main/webapp/favicon.ico | Bin 0 -> 1150 bytes
plc4j/examples/pom.xml | 7 +
plc4j/integrations/apache-camel/pom.xml | 29 +-
.../org/apache/plc4x/camel/Plc4XComponent.java | 3 +-
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 9 +-
.../java/org/apache/plc4x/camel/Plc4XEndpoint.java | 8 +-
.../apache/plc4x/camel/Plc4XPollingConsumer.java | 9 +-
.../java/org/apache/plc4x/camel/Plc4XProducer.java | 17 +-
.../java/org/apache/plc4x/camel/ConstantsTest.java | 25 +-
.../java/org/apache/plc4x/camel/ManualTest.java | 7 +-
.../org/apache/plc4x/camel/Plc4XComponentTest.java | 4 +-
.../org/apache/plc4x/camel/Plc4XConsumerTest.java | 2 +-
.../org/apache/plc4x/camel/Plc4XEndpointTest.java | 8 +-
.../plc4x/camel/Plc4XPollingConsumerTest.java | 2 +-
.../org/apache/plc4x/camel/Plc4XProducerTest.java | 10 +-
.../plc4x/edgent/PlcConnectionAdapterTest.java | 3 -
.../apache-nifi/nifi-plc4x-nar/pom.xml | 31 +
.../plc4x4nifi/Plc4xSinkProcessorTest.java | 6 +-
.../plc4x4nifi/Plc4xSourceProcessorTest.java | 6 +-
plc4j/integrations/apache-nifi/pom.xml | 4 +-
.../java/org/apache/plc4x/karaf/FeatureIT.java | 4 +-
plc4j/pom.xml | 32 +-
.../spi/GeneratedDriverByteToMessageCodec.java | 27 +-
.../java/spi/connection/GeneratedDriverBase.java | 1 +
.../apache/plc4x/java/spi/generation/Message.java | 2 +
.../java/spi/messages/DefaultPlcReadResponse.java | 5 +
.../internal/DefaultSendRequestContextTest.java | 2 +-
.../optimizer/RequestTransactionManagerTest.java | 8 +-
plc4j/tools/capture-replay/README.adoc | 38 +
.../pcap-sockets => tools/capture-replay}/pom.xml | 92 +-
.../java/utils/capturereplay/CaptureReplay.java | 114 +
.../plc4x/java/utils/capturereplay/CliOptions.java | 119 +
.../capture-replay/src/main/resources/logback.xml | 42 +-
plc4j/tools/opm/pom.xml | 5 -
.../apache/plc4x/java/opm/ConnectedEntityTest.java | 3 +-
.../org/apache/plc4x/java/opm/OpmUtilsTest.java | 2 +-
.../plc4x/java/opm/PlcEntityInterceptorTest.java | 3 +-
.../java/opm/PlcEntityManagerComplexTest.java | 12 +-
.../plc4x/java/opm/PlcEntityManagerTest.java | 5 +-
.../plc4x/java/opm/SimpleAliasRegistryTest.java | 2 +-
plc4j/tools/pom.xml | 1 +
plc4j/tools/scraper/pom.xml | 6 -
.../triggeredscraper/TriggeredScraperImplTest.java | 7 +-
.../triggerhandler/TriggerConfigurationTest.java | 5 +-
.../{pcap-socket => pcap-replay}/pom.xml | 18 +-
.../pcapreplay/PcapReplayChannelFactory.java} | 28 +-
.../transport/pcapreplay/PcapReplayTransport.java} | 10 +-
.../PcapReplayTransportConfiguration.java} | 14 +-
.../org.apache.plc4x.java.spi.transport.Transport | 2 +-
.../transports/{raw-socket => pcap-shared}/pom.xml | 20 +-
.../transport/pcap/PcapTransportConfiguration.java | 15 +-
plc4j/transports/pom.xml | 3 +-
plc4j/transports/raw-socket/pom.xml | 10 +
.../rawsocket/RawSocketChannelFactory.java | 17 +-
.../transport/rawsocket/RawSocketTransport.java | 4 +-
.../rawsocket/RawSocketTransportConfiguration.java | 6 +-
.../plc4x/java/transport/serial/SerialChannel.java | 15 +-
.../java/transport/serial/SerialChannelConfig.java | 109 +
.../transport/serial/SerialChannelFactory.java | 4 +
.../transport/serial/SerialChannelHandler.java | 8 +-
.../transport/serial/SerialChannelOptions.java | 49 +
.../transport/serial/SerialPollingSelector.java | 22 +-
.../serial/SerialTransportConfiguration.java | 15 +
.../base/connection/SerialChannelFactoryTest.java | 2 +-
plc4j/transports/test/pom.xml | 6 -
plc4j/utils/{pcap-sockets => pcap-replay}/pom.xml | 10 +-
.../utils/pcapreplay/netty/PcapReplayChannel.java} | 60 +-
.../netty/address/PcapReplayAddress.java} | 12 +-
.../netty/config/PcapReplayChannelConfig.java | 81 +
.../netty/config/PcapReplayChannelOption.java} | 22 +-
plc4j/utils/{pcap-sockets => pcap-shared}/pom.xml | 15 +-
.../pcap/netty/address/PcapSocketAddress.java} | 8 +-
.../utils/pcap/netty/config/PcapChannelConfig.java | 152 +
.../pcap/netty/config/PcapChannelOption.java} | 23 +-
.../utils/pcap/netty/exception/PcapException.java} | 10 +-
.../utils/pcap/netty/handlers}/PacketHandler.java | 2 +-
.../pcap/netty/handlers}/TcpIpPacketHandler.java | 2 +-
.../pcap}/netty/handlers/UdpIpPacketHandler.java | 2 +-
.../utils/pcapsockets/PcapSocketException.java | 34 -
.../pcapsockets/netty/PcapSocketChannelConfig.java | 124 -
.../netty/handlers/TcpIpPacketHandler.java | 41 -
plc4j/utils/pom.xml | 3 +-
plc4j/utils/raw-sockets/pom.xml | 6 +
.../utils/rawsockets/attic/RawEthernetSocket.java | 14 +-
.../java/utils/rawsockets/attic/RawIpSocket.java | 32 +-
.../utils/rawsockets/netty/RawSocketChannel.java | 29 +-
.../rawsockets/netty/RawSocketChannelConfig.java | 66 -
.../utils/rawsockets/netty/RawSocketIpAddress.java | 46 -
.../utils/rawsockets/netty/UdpIpPacketHandler.java | 41 -
.../netty/{ => address}/RawSocketAddress.java | 17 +-
.../netty/config/RawSocketChannelConfig.java} | 11 +-
.../utils/rawsockets/attic/RawIpSocketTest.java | 14 +-
.../rawsockets/netty/RawSocketChannelTest.java | 12 +-
plc4j/utils/test-utils/pom.xml | 9 +-
.../ParserSerializerTestsuiteRunner.java | 13 +-
pom.xml | 81 +-
protocols/firmata/pom.xml | 43 +
.../plc4x/protocol/firmata/FirmataProtocol.java | 46 +
...e.plc4x.plugins.codegenerator.protocol.Protocol | 3 +-
.../main/resources/protocols/firmata/firmata.mspec | 142 +
protocols/pom.xml | 1 +
.../s7/src/main/resources/protocols/s7/s7.mspec | 59 +-
sandbox/code-gen/pom.xml | 17 +-
.../org/apache/plc4x/codegen/DFDLUtilTest.java | 4 +-
.../org/apache/plc4x/codegen/ModuleNodeTest.java | 3 +-
.../plc4x/codegen/ast/JavaGeneratorTest.java | 10 +-
.../plc4x/codegen/ast/PythonGeneratorTest.java | 10 +-
.../apache/plc4x/codegen/util/EnumFactoryTest.java | 3 +-
.../apache/plc4x/codegen/util/PojoFactoryTest.java | 3 +-
sandbox/plc4py/README.md | 23 +-
.../python/org/apache/plc4x/PlcDriverManager.py | 74 +-
sandbox/pom.xml | 15 +-
sandbox/test-java-amsads-driver/pom.xml | 16 -
sandbox/test-java-bacnetip-driver/pom.xml | 2 +-
.../PassiveBacNetIpConfiguration.java | 26 +-
sandbox/test-java-df1-driver/pom.xml | 16 -
sandbox/test-streampipes-plc4x-adapters/pom.xml | 13 +-
src/site/asciidoc/developers/building.adoc | 4 +-
src/site/asciidoc/developers/index.adoc | 8 +-
.../developers/infrastructure/website.adoc | 2 +-
src/site/asciidoc/developers/maturity.adoc | 6 +-
.../asciidoc/developers/release/build-tools.adoc | 4 +-
.../asciidoc/developers/release/validation.adoc | 22 +-
.../asciidoc/users/blogs-videos-and-slides.adoc | 40 +
src/site/asciidoc/users/download.adoc | 36 +-
src/site/asciidoc/users/index.adoc | 13 +
src/site/asciidoc/users/opm.adoc | 73 -
.../asciidoc/users/plc4j/general-concepts.adoc | 106 +
src/site/asciidoc/users/plc4j/gettingstarted.adoc | 124 +-
src/site/asciidoc/users/protocols/ab-eth.adoc | 2 +-
src/site/asciidoc/users/protocols/ads.adoc | 2 +-
src/site/asciidoc/users/protocols/bacnetip.adoc | 2 +-
src/site/asciidoc/users/protocols/deltav.adoc | 2 +-
src/site/asciidoc/users/protocols/df1.adoc | 2 +-
src/site/asciidoc/users/protocols/ethernet-ip.adoc | 2 +-
src/site/asciidoc/users/protocols/firmata.adoc | 120 +
src/site/asciidoc/users/protocols/index.adoc | 2 +-
src/site/asciidoc/users/protocols/knxnetip.adoc | 2 +-
src/site/asciidoc/users/protocols/modbus.adoc | 93 +-
src/site/asciidoc/users/protocols/opc-ua.adoc | 2 +-
src/site/asciidoc/users/protocols/s7.adoc | 260 +-
src/site/asciidoc/users/protocols/simulated.adoc | 2 +-
src/site/asciidoc/users/testing.adoc | 165 -
src/site/asciidoc/users/tools/capture-replay.adoc | 59 +
.../{protocols/ads.adoc => transports/index.adoc} | 8 +-
.../ads.adoc => transports/pcap-replay.adoc} | 49 +-
.../ads.adoc => transports/raw-socket.adoc} | 33 +-
.../{protocols/ads.adoc => transports/serial.adoc} | 36 +-
.../{protocols/ads.adoc => transports/tcp.adoc} | 33 +-
.../{protocols/ads.adoc => transports/udp.adoc} | 33 +-
src/site/resources-filtered/plc4x-doap.rdf | 7 +
.../users/protocols/s7-tia-device-settings.png | Bin 0 -> 391398 bytes
.../images/users/protocols/s7-tia-io-settings.png | Bin 0 -> 42175 bytes
src/site/site.xml | 19 +-
tools/common.sh | 2 +-
251 files changed, 9380 insertions(+), 2219 deletions(-)