This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch featule/kafka-connect-refactoring
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from 639c5e8 Merge branches 'develop' and
'featule/kafka-connect-refactoring' of
https://gitbox.apache.org/repos/asf/plc4x into featule/kafka-connect-refactoring
add cc9c016 - Added Passive mode templates and an sandbox passive mode s7
driver
add 2d0a582 Example MSpec for the DF1 protocol added to the website
add 7fca0a5 Merge pull request #79 from vemmert/site-mspec-df1-example
add 6220138 - Implement a first partially working passive S7 driver. -
Fixed some issues in the S7 mspec - Fixed some issues with optional fields in
the code generation - Extended the mspec antlr4 grammar to support "/" and "*"
operations
add 79cdbce PLC4X-86 - Fix and re-enable tests that were disabled for
Java 11 support
add afaa24c Merge pull request #78 from
thomasdarimont/issue/PLC4X-86-Fix-tests-failing-on-java11
add 28d8f6c - Fixed a dependency usage problem.
add 7537323 - Removed some invalid configuration options raw sockets
don't support.
add cdd53c9 - Increasing the timeout to 24 hours as Jenkins seems to be
rather slow at the moment ...
add a660a46 - Changed the deploy phase to run on a node labeled:
nexus-deploy
new b649586 Merge branches 'develop' and
'featule/kafka-connect-refactoring' of
https://gitbox.apache.org/repos/asf/plc4x into featule/kafka-connect-refactoring
new 74c892c - Finished a first fully operational version of the Kafka
Connect Source
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 +-
.../org/apache/plc4x/kafka/Plc4xSourceTask.java | 175 +++++++++-------
.../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} | 6 +-
.../apache/plc4x/java/utils/MessageOutput.java} | 7 +-
.../java/utils/rawsockets/netty/PacketHandler.java | 8 +-
.../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 +
.../pom.xml | 16 +-
.../plc4x/javapassive/s7/PassiveS7PlcDriver.java | 40 ++--
.../s7/connection/PassiveS7PlcConnection.java | 98 +++++++++
.../s7/protocol/HelloWorldProtocol.java | 48 +++++
.../javapassive/s7/protocol/PassiveS7Protocol.java | 62 ++++++
.../services/org.apache.plc4x.java.spi.PlcDriver | 2 +-
.../test/java/BenchmarkGeneratedPassiveS7.java} | 32 +--
.../main/resources/protocols/df1/protocol.mspec | 222 ---------------------
.../asciidoc/developers/code-gen/protocol/df1.adoc | 94 +++++++++
src/site/site.xml | 1 +
36 files changed, 584 insertions(+), 526 deletions(-)
copy
build-utils/language-java/src/main/java/org/apache/plc4x/language/java/{JavaLanguageOutput.java
=> JavaActiveLanguageOutput.java} (94%)
rename
build-utils/language-java/src/main/java/org/apache/plc4x/language/java/{JavaLanguageOutput.java
=> JavaPassiveLanguageOutput.java} (77%)
copy
build-utils/language-java/src/main/resources/templates/java/{io-template.ftlh
=> active-io-template.ftlh} (99%)
rename
build-utils/language-java/src/main/resources/templates/java/{io-template.ftlh
=> passive-io-template.ftlh} (75%)
copy
plc4j/{protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProtocolMessage.java
=>
utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/MessageInput.java}
(82%)
copy
plc4j/{api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteResponse.java
=>
utils/driver-base-java/src/main/java/org/apache/plc4x/java/utils/MessageOutput.java}
(80%)
copy sandbox/code-gen/src/main/java/org/apache/plc4x/codegen/ast/Node.java =>
plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/PacketHandler.java
(83%)
copy
plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/{RawSocketChannelConfig.java
=> TcpIpPacketHandler.java} (59%)
copy sandbox/{test-java-s7-driver => test-java-passive-s7-driver}/pom.xml (84%)
copy plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/S7PlcDriver.java
=>
sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/PassiveS7PlcDriver.java
(62%)
create mode 100644
sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/connection/PassiveS7PlcConnection.java
create mode 100644
sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/protocol/HelloWorldProtocol.java
create mode 100644
sandbox/test-java-passive-s7-driver/src/main/java/org/apache/plc4x/javapassive/s7/protocol/PassiveS7Protocol.java
copy {plc4j/api/src/test/resources/test =>
sandbox/test-java-passive-s7-driver/src/main/resources}/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
(93%)
copy sandbox/{test-java-s7-driver/src/test/java/BenchmarkGeneratedS7.java =>
test-java-passive-s7-driver/src/test/java/BenchmarkGeneratedPassiveS7.java}
(60%)
delete mode 100644
sandbox/test-java-s7-driver/src/main/resources/protocols/df1/protocol.mspec
create mode 100644 src/site/asciidoc/developers/code-gen/protocol/df1.adoc