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 2018/09/06 21:14:56 UTC

[incubator-plc4x] 05/05: Merge branch 'skorikov-feature/apache-kafka' into feature/apache-kafka

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch feature/apache-kafka
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git

commit e8149ce5fff7e4bb96eb442dbae63b583e8e1d46
Merge: d6be19e 9184353
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Sep 6 23:14:31 2018 +0200

    Merge branch 'skorikov-feature/apache-kafka' into feature/apache-kafka

 .../apache/plc4x/kafka/Plc4xSourceConnector.java   |  10 +-
 .../org/apache/plc4x/kafka/common/Plc4xConfig.java |  26 +++-
 .../apache/plc4x/kafka/source/Plc4xSourceTask.java |  44 ++++--
 plc4j/protocols/pom.xml                            |   1 +
 plc4j/protocols/{ => test}/pom.xml                 |  29 ++--
 .../org/apache/plc4x/java/test/TestAddress.java    |  72 ++++++++++
 .../org/apache/plc4x/java/test/TestConnection.java | 149 +++++++++++++++++++++
 .../org/apache/plc4x/java/test/TestDevice.java     |  76 +++++++++++
 .../org/apache/plc4x/java/test/TestPlcDriver.java  |  61 +++++++++
 .../services/org.apache.plc4x.java.api.PlcDriver   |  19 +++
 .../org/apache/plc4x/java/test/TestDeviceTest.java |  53 ++++++++
 11 files changed, 505 insertions(+), 35 deletions(-)