This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch featule/kafka-connect-refactoring in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit b6495869dcc8b649df18811c439516ce154ba5b9 Merge: 639c5e8 a660a46 Author: Christofer Dutz <[email protected]> AuthorDate: Sat Aug 24 17:33:25 2019 +0200 Merge branches 'develop' and 'featule/kafka-connect-refactoring' of https://gitbox.apache.org/repos/asf/plc4x into featule/kafka-connect-refactoring Jenkinsfile | 4 +- ...geOutput.java => JavaActiveLanguageOutput.java} | 4 +- ...eOutput.java => JavaPassiveLanguageOutput.java} | 17 +- ...x.plugins.codegenerator.language.LanguageOutput | 3 +- .../{io-template.ftlh => active-io-template.ftlh} | 2 +- .../{io-template.ftlh => passive-io-template.ftlh} | 113 +---------- .../resources/templates/java/pojo-template.ftlh | 4 + .../plugins/codegenerator/language/mspec/MSpec.g4 | 2 + .../connection/AdsAbstractPlcConnectionTest.java | 9 +- .../ads/connection/AdsTcpPlcConnectionTests.java | 26 ++- plc4j/integrations/apache-camel/pom.xml | 8 +- .../org/apache/plc4x/camel/Plc4XProducerTest.java | 9 +- .../base/connection/RawSocketChannelFactory.java | 5 +- .../java/base/connection/SerialChannelFactory.java | 2 - .../org/apache/plc4x/java/utils/MessageIO.java | 7 +- .../org/apache/plc4x/java/utils/MessageInput.java} | 12 +- .../apache/plc4x/java/utils/MessageOutput.java} | 12 +- ...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 - .../s7/src/main/resources/protocols/s7/s7.mspec | 14 +- sandbox/pom.xml | 1 + sandbox/test-java-passive-s7-driver/pom.xml | 101 ++++++++++ .../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 +++++++++ src/site/site.xml | 1 + 35 files changed, 678 insertions(+), 419 deletions(-)
