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 2019/08/27 13:58:31 UTC
[plc4x] 43/44: Merge branch 'develop' of github.com:apache/plc4x
into feature/implement-logstash-integration
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 54a0d357a18d3d85cf540f016a90a8b2af870ae4
Merge: 7f328e5 05b2bdd
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Aug 27 15:46:20 2019 +0200
Merge branch 'develop' of github.com:apache/plc4x into feature/implement-logstash-integration
Jenkinsfile | 4 +-
.../freemarker/FreemarkerLanguageOutput.java | 5 +-
...geOutput.java => JavaActiveLanguageOutput.java} | 4 +-
.../language/java/JavaLanguageTemplateHelper.java | 10 +-
...eOutput.java => JavaPassiveLanguageOutput.java} | 17 +-
...x.plugins.codegenerator.language.LanguageOutput | 3 +-
.../{io-template.ftlh => active-io-template.ftlh} | 12 +-
.../{io-template.ftlh => passive-io-template.ftlh} | 123 +---
.../resources/templates/java/pojo-template.ftlh | 8 +-
.../plugins/codegenerator/language/mspec/MSpec.g4 | 2 +
plc4cpp/pom.xml | 7 +-
plc4j/drivers/ads/pom.xml | 5 -
.../connection/AdsAbstractPlcConnectionTest.java | 9 +-
.../ads/connection/AdsSerialPlcConnectionTest.java | 4 +-
.../ads/connection/AdsTcpPlcConnectionTests.java | 26 +-
plc4j/drivers/modbus/pom.xml | 5 -
.../connection/ModbusSerialPlcConnectionTest.java | 4 +-
plc4j/examples/hello-world-plc4x/pom.xml | 4 +-
.../plc4x/java/examples/helloplc4x/HelloPlc4x.java | 2 +
plc4j/integrations/apache-camel/pom.xml | 8 +-
.../org/apache/plc4x/camel/Plc4XProducerTest.java | 9 +-
plc4j/integrations/apache-kafka/README.md | 60 +-
.../apache-kafka/config/sink.properties | 25 -
.../apache-kafka/config/source.properties | 59 +-
plc4j/integrations/apache-kafka/pom.xml | 117 +++-
.../apache-kafka/src/assembly/assembly.xml | 42 ++
.../org/apache/plc4x/kafka/Plc4xSinkConnector.java | 77 ---
.../java/org/apache/plc4x/kafka/Plc4xSinkTask.java | 116 ----
.../apache/plc4x/kafka/Plc4xSourceConnector.java | 140 ++---
.../org/apache/plc4x/kafka/Plc4xSourceTask.java | 351 ++++++------
.../org/apache/plc4x/kafka/config/Defaults.java} | 14 +-
.../java/org/apache/plc4x/kafka/config/Job.java} | 30 +-
.../apache/plc4x/kafka/config/JobReference.java} | 27 +-
.../org/apache/plc4x/kafka/config/Source.java} | 27 +-
.../apache/plc4x/kafka/config/SourceConfig.java | 160 ++++++
.../kafka/exceptions/ConfigurationException.java} | 14 +-
.../plc4x/kafka/config/SourceConfigTest.java | 78 +++
.../base/connection/RawSocketChannelFactory.java | 5 +-
plc4j/protocols/driver-bases/serial/pom.xml | 23 +-
.../plc4x/java/base/connection/SerialChannel.java | 636 +++++++++++++++++++++
.../java/base/connection/SerialChannelFactory.java | 36 +-
.../java/base/connection/SerialChannelHandler.java | 172 ++++++
.../base/connection/SerialPollingSelector.java | 179 ++++++
.../java/base/connection/SerialSelectionKey.java | 81 +++
.../base/connection/SerialSelectorProvider.java | 68 +++
.../java/base/connection/SerialSocketAddress.java | 36 +-
.../java/base/connection/SerialSocketChannel.java | 158 +++++
.../base/connection/SerialChannelFactoryTest.java | 108 ++++
.../org/apache/plc4x/java/utils/MessageIO.java | 7 +-
.../org/apache/plc4x/java/utils/MessageInput.java} | 12 +-
.../apache/plc4x/java/utils/MessageOutput.java} | 12 +-
.../protocol/test/ProtocolTestsuiteRunner.java | 5 +
...SocketChannelOption.java => PacketHandler.java} | 10 +-
.../utils/rawsockets/netty/RawSocketChannel.java | 11 +-
.../rawsockets/netty/RawSocketChannelConfig.java | 32 +-
.../rawsockets/netty/RawSocketChannelOption.java | 3 +-
...tChannelConfig.java => TcpIpPacketHandler.java} | 21 +-
.../rawsockets/netty/RawSocketChannelTest.java | 2 -
.../JobConfigurationTriggeredImplBuilder.java | 2 +-
.../triggeredscraper/TriggeredScraperImpl.java | 8 +-
.../triggeredscraper/TriggeredScraperTask.java | 1 -
plc4py/src/main/python/__init__.py | 9 -
pom.xml | 12 +-
protocols/ab-eth/pom.xml | 43 ++
.../apache/plc4x/protocol/abeth/ABETHProtocol.java | 46 ++
...e.plc4x.plugins.codegenerator.protocol.Protocol | 4 +-
.../main/resources/protocols/abeth/ab-eth.mspec | 84 +++
protocols/pom.xml | 3 +-
.../s7/src/main/resources/protocols/s7/s7.mspec | 14 +-
sandbox/pom.xml | 2 +
.../pom.xml | 98 +---
.../org/apache/plc4x/java/abeth/AbEthDriver.java | 72 +++
.../java/abeth/connection/AbEthFieldHandler.java | 22 +-
.../java/abeth/connection/AbEthPlcConnection.java | 132 +++++
.../apache/plc4x/java/abeth/model/AbEthField.java | 90 +++
.../plc4x/java/abeth/model/types/FileType.java | 62 ++
.../plc4x/java/abeth/protocol/AbEthProtocol.java | 69 +++
.../java/abeth/protocol/Plc4xAbEthProtocol.java | 209 +++++++
.../services/org.apache.plc4x.java.spi.PlcDriver | 4 +-
.../org/apache/plc4x/protocol/abeth/AbEthTest.java | 30 +
.../test/resources/testsuite/AbEthTestsuite.xml | 163 ++++++
sandbox/test-java-df1-driver/pom.xml | 12 +-
.../org/apache/plc4x/java/df1/DF1PlcDriver.java | 1 +
.../java/org/apache/plc4x/java/df1/Df1Field.java | 15 +-
.../org/apache/plc4x/java/df1/fields/DataType.java | 31 +-
.../plc4x/java/df1/protocol/Df1Protocol.java | 94 +--
.../plc4x/java/df1/protocol/Plc4XDf1Protocol.java | 127 +++-
.../org/apache/plc4x/java/df1/util/DF1Utils.java | 68 ++-
.../plc4x/protocol/df1/BenchmarkManualDf1.java | 30 +-
.../apache/plc4x/protocol/df1/EndToEndTest.java | 11 +-
.../test-java-passive-s7-driver}/pom.xml | 90 +--
.../plc4x/javapassive/s7/PassiveS7PlcDriver.java | 89 +++
.../s7/connection/PassiveS7PlcConnection.java | 98 ++++
.../s7/protocol/HelloWorldProtocol.java | 48 ++
.../javapassive/s7/protocol/PassiveS7Protocol.java | 62 ++
.../services/org.apache.plc4x.java.spi.PlcDriver | 4 +-
.../src/test/java/BenchmarkGeneratedPassiveS7.java | 45 ++
.../main/resources/protocols/df1/protocol.mspec | 222 -------
.../asciidoc/developers/code-gen/protocol/df1.adoc | 94 +++
.../developers/writing-driver/writing-driver.adoc | 57 ++
src/site/site.xml | 1 +
101 files changed, 4258 insertions(+), 1345 deletions(-)