You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by jf...@apache.org on 2019/01/21 22:31:07 UTC
[incubator-plc4x] 01/02: Merge branch 'develop' into rel/0.3
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a commit to branch rel/0.3
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 58cd74a47ece67924a7204f2bcca3d7b53beba9e
Merge: b0a46fa 7c843a2
Author: Julian Feinauer <j....@pragmaticminds.de>
AuthorDate: Mon Jan 21 23:16:08 2019 +0100
Merge branch 'develop' into rel/0.3
# Conflicts:
# plc4cpp/api/pom.xml
# plc4cpp/libs/pom.xml
# plc4cpp/pom.xml
# plc4j/drivers/delta-v/pom.xml
# plc4j/utils/scraper/pom.xml
DEVELOPMENT.md | 2 +-
Jenkinsfile | 2 -
README | 41 +-
plc4c/pom.xml => Sometimes-Failling-Tests.md | 28 +-
examples/dummy-driver/pom.xml | 8 +-
examples/hello-cloud-azure/pom.xml | 6 +-
examples/hello-cloud-google/pom.xml | 7 +-
examples/hello-connectivity-kafka/pom.xml | 10 +-
examples/hello-connectivity-mqtt/pom.xml | 8 +-
examples/hello-integration-edgent/pom.xml | 6 +-
examples/hello-opm/pom.xml | 10 +-
examples/hello-storage-elasticsearch/pom.xml | 14 +-
examples/hello-world-plc4x/pom.xml | 8 +-
examples/pom.xml | 2 +-
integrations/apache-brooklyn/pom.xml | 2 +-
integrations/apache-calcite/pom.xml | 10 +-
integrations/apache-camel/pom.xml | 8 +-
integrations/apache-edgent/pom.xml | 10 +-
integrations/apache-kafka/pom.xml | 4 +-
.../apache-karaf/karaf-ads-feature/pom.xml | 6 +-
.../apache-karaf/karaf-demo-server/pom.xml | 14 +-
.../apache-karaf/karaf-ethernet-ip-feature/pom.xml | 6 +-
.../apache-karaf/karaf-modbus-feature/pom.xml | 6 +-
integrations/apache-karaf/karaf-s7-feature/pom.xml | 6 +-
.../apache-karaf/karaf-simulated-feature/pom.xml | 6 +-
integrations/apache-karaf/pom.xml | 11 +-
integrations/apache-mynewt/pom.xml | 2 +-
integrations/apache-nifi/nifi-plc4x-nar/pom.xml | 18 +-
.../apache-nifi/nifi-plc4x-processors/pom.xml | 6 +-
integrations/apache-nifi/pom.xml | 2 +-
integrations/pom.xml | 2 +-
plc4c/pom.xml | 2 +-
plc4cpp/README.md | 3 +-
plc4j/api/pom.xml | 5 +-
plc4j/drivers/ads/pom.xml | 21 +-
.../apache/plc4x/java/ads/AdsPlcDriverTest.java | 36 +-
plc4j/drivers/ethernet-ip/pom.xml | 10 +-
.../src/test/resources/read-attribute.pcap | Bin 0 -> 258 bytes
.../src/test/resources/read-attribute.pcapng | Bin 664 -> 0 bytes
plc4j/drivers/modbus/pom.xml | 15 +-
.../plc4x/java/modbus/ModbusPlcDriverTest.java | 4 +-
plc4j/drivers/pom.xml | 2 +-
plc4j/drivers/s7/pom.xml | 24 +-
.../java/org/apache/plc4x/java/s7/S7PlcDriver.java | 2 +
.../org/apache/plc4x/java/s7/S7PlcDriverTest.java | 2 +
.../java/s7/connection/S7PlcConnectionIT.java | 14 +-
.../java/s7/connection/S7PlcTestConnection.java | 2 +-
.../java/s7/connection/s7-read-large-response.pcap | Bin 0 -> 652 bytes
.../s7/connection/s7-read-large-response.pcapng | Bin 1040 -> 0 bytes
.../java/s7/connection/s7-read-var-request.pcap | Bin 0 -> 125 bytes
.../java/s7/connection/s7-read-var-request.pcapng | Bin 400 -> 0 bytes
.../java/s7/connection/s7-read-var-response.pcap | Bin 0 -> 120 bytes
.../java/s7/connection/s7-read-var-response.pcapng | Bin 392 -> 0 bytes
.../java/s7/connection/s7-write-var-request.pcap | Bin 0 -> 130 bytes
.../java/s7/connection/s7-write-var-request.pcapng | Bin 404 -> 0 bytes
.../java/s7/connection/s7-write-var-response.pcap | Bin 0 -> 116 bytes
.../s7/connection/s7-write-var-response.pcapng | Bin 388 -> 0 bytes
plc4j/drivers/simulated/pom.xml | 8 +-
plc4j/pom.xml | 2 +-
plc4j/protocols/ads/pom.xml | 10 +-
plc4j/protocols/benchmarks/pom.xml | 6 +-
plc4j/protocols/delta-v/pom.xml | 10 +-
plc4j/protocols/driver-bases/base/pom.xml | 6 +-
plc4j/protocols/driver-bases/pom.xml | 2 +-
plc4j/protocols/driver-bases/raw-socket/pom.xml | 6 +-
plc4j/protocols/driver-bases/serial/pom.xml | 7 +-
plc4j/protocols/driver-bases/tcp/pom.xml | 6 +-
.../base/connection/TcpSocketChannelFactory.java | 2 +
plc4j/protocols/driver-bases/test/pom.xml | 6 +-
plc4j/protocols/ethernet-ip/pom.xml | 6 +-
plc4j/protocols/iso-on-tcp/pom.xml | 8 +-
plc4j/protocols/iso-tp/pom.xml | 10 +-
plc4j/protocols/modbus/pom.xml | 8 +-
plc4j/protocols/pom.xml | 2 +-
plc4j/protocols/s7/pom.xml | 11 +-
.../org/apache/plc4x/java/s7/model/S7Field.java | 54 +-
.../model/params/items/S7AnyVarParameterItem.java | 12 +-
.../s7/netty/model/types/DataTransportSize.java | 2 +-
.../java/s7/netty/model/types/MemoryArea.java | 2 +-
.../java/s7/netty/model/types/MessageType.java | 2 +-
.../java/s7/netty/model/types/ParameterType.java | 2 +-
.../s7/netty/model/types/SpecificationType.java | 2 +-
.../netty/model/types/VariableAddressingMode.java | 2 +-
.../strategies/DefaultS7MessageProcessor.java | 12 +-
.../java/org/apache/plc4x/java/issues/PLC4X56.java | 42 +-
.../org/apache/plc4x/java/s7/PcapGenerator.java | 6 +-
.../apache/plc4x/java/s7/model/S7FieldTests.java | 8 +-
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 8 +-
.../s7/netty/model/messages/S7MessageTests.java | 9 +-
.../strategies/DefaultS7MessageProcessorTest.java | 10 +-
plc4j/utils/connection-pool/pom.xml | 4 +-
plc4j/utils/opm/pom.xml | 11 +-
plc4j/utils/pom.xml | 3 +-
plc4j/utils/raw-sockets/pom.xml | 10 +-
.../java/utils/rawsockets/RawIpSocketTest.java | 2 +
plc4j/utils/scraper/pom.xml | 8 +-
.../apache/plc4x/java/scraper/ScraperTaskTest.java | 3 +
.../org/apache/plc4x/java/scraper/ScraperTest.java | 3 +
.../src/test/resources/example_with_strings.yml | 14 +-
plc4j/utils/test-utils/pom.xml | 22 +-
.../plc4x/test/RequireInternetConnection.java | 33 ++
.../test/RequireInternetConnectionCondition.java | 45 ++
.../apache/plc4x/test/RequireNonCaptureAllDns.java | 33 ++
.../test/RequireNonCaptureAllDnsCondition.java | 40 ++
.../java/org/apache/plc4x/test/RequirePcap.java | 33 ++
.../apache/plc4x/test/RequirePcapCondition.java | 57 ++
.../java/org/apache/plc4x/test/RequirePcapNg.java | 33 ++
.../apache/plc4x/test/RequirePcapNgCondition.java | 69 +++
plc4j/utils/wireshark-utils/pom.xml | 42 --
.../org/apache/plc4x/java/utils/PcapngUtils.java | 106 ----
plc4s/pom.xml | 2 +-
pom.xml | 447 +++++++++++++---
{plc4j/drivers/simulated => protocols}/pom.xml | 47 +-
.../src/main/dfdl/daffodil-built-in-catalog.xml | 31 +-
.../apache/plc4x/protocols/cotp-protocol.dfdl.xsd | 213 ++++++++
.../apache/plc4x/protocols/s7-protocol.dfdl.xsd | 587 +++++++++++++++++++++
.../apache/plc4x/protocols/tpkt-protocol.dfdl.xsd | 87 +++
plc4c/pom.xml => protocols/src/main/java/.keepMe | 24 -
.../plc4x/protocols/AbstractProtocolTest.java | 56 ++
.../apache/plc4x/protocols/TpktProtocolTest.java | 31 ++
.../org/apache/plc4x/protocols/tpkt-protocol.tdml | 112 ++++
src/site/asciidoc/developers/release.adoc | 37 ++
src/site/asciidoc/protocols/s7/s7comm.adoc | 2 +-
123 files changed, 2328 insertions(+), 621 deletions(-)