This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch feature/Beckhoff_ADS_protocol
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 9a09ef40c8eba129c49e9f91d3d8045dc14cac77
Merge: 1833df7 1eae1c9
Author: Sebastian Rühl <sru...@apache.org>
AuthorDate: Thu Feb 15 17:11:48 2018 +0100
Merge remote-tracking branch 'origin/master' into
feature/Beckhoff_ADS_protocol
# Conflicts:
# plc4j/protocols/pom.xml
Jenkinsfile | 6 +-
.../java/examples/dummydriver/DummyDriver.java | 12 +-
.../dummydriver/connection/DummyConnection.java | 11 +
.../examples/dummydriver/netty/DummyProtocol.java | 28 +-
examples/kafka-bridge/kafka-bridge.yml | 34 ++
examples/{plclogger => kafka-bridge}/pom.xml | 44 ++-
examples/kafka-bridge/server.sh | 31 ++
.../java/examples/kafkabridge/KafkaBridge.java | 121 ++++++
.../java/examples/kafkabridge/model/Address.java | 47 ++-
.../examples/kafkabridge/model/Configuration.java | 56 +++
.../examples/kafkabridge/model/KafkaConfig.java | 34 +-
.../java/examples/kafkabridge/model/PlcConfig.java | 32 +-
.../kafka-bridge/src/main/resources/logback.xml | 40 +-
examples/plclogger/pom.xml | 4 +
.../plc4x/java/examples/plclogger/PlcLogger.java | 74 +---
examples/pom.xml | 1 +
.../java/org/apache/plc4x/camel/ConstantsTest.java | 8 +-
.../org/apache/plc4x/camel/PLC4XComponentTest.java | 14 +-
.../org/apache/plc4x/camel/PLC4XEndpointTest.java | 25 +-
.../org/apache/plc4x/camel/PLC4XProducerTest.java | 20 +-
integrations/apache-edgent/pom.xml | 7 +
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 4 +
.../plc4x/edgent/PlcConnectionAdapterTest.java | 157 ++++----
.../org/apache/plc4x/edgent/PlcFunctionsTest.java | 11 +-
.../apache/plc4x/edgent/mock/MockConnection.java | 11 +-
plc4j/api/pom.xml | 6 +
.../plc4x/java/api/connection/PlcConnection.java | 7 +
.../PlcUsernamePasswordAuthenticationTest.java | 17 +-
.../plc4x/java/api/connection/PlcReaderTest.java | 7 +-
.../plc4x/java/api/connection/PlcWriterTest.java | 7 +-
.../plc4x/java/api/messages/APIMessageTests.java | 193 +++++-----
.../java/api/messages/PlcReadRequestTest.java | 32 +-
.../java/api/messages/PlcReadResponseTest.java | 8 +-
.../plc4x/java/api/messages/PlcRequestTest.java | 44 +--
.../plc4x/java/api/messages/PlcResponseTest.java | 50 +--
.../java/api/messages/PlcWriteRequestTest.java | 32 +-
.../java/api/messages/PlcWriteResponseTest.java | 8 +-
.../specific/TypeSafePlcReadRequestTest.java | 32 +-
.../specific/TypeSafePlcReadResponseTest.java | 26 +-
.../specific/TypeSafePlcWriteRequestTest.java | 30 +-
.../specific/TypeSafePlcWriteResponseTest.java | 20 +-
plc4j/core/pom.xml | 7 +
.../apache/plc4x/java/PlcDriverManagerTest.java | 27 +-
plc4j/protocols/{s7 => driver-base}/pom.xml | 50 ++-
.../base/connection/AbstractPlcConnection.java | 116 ++++++
.../java/base/connection/ChannelFactory.java} | 24 +-
.../base/connection/TcpSocketChannelFactory.java | 63 ++++
.../java/base/connection/TestChannelFactory.java} | 24 +-
plc4j/protocols/pom.xml | 1 +
plc4j/protocols/s7/pom.xml | 24 ++
.../java/isotp/netty/model/types/TpduSize.java | 40 +-
.../java/org/apache/plc4x/java/s7/S7PlcDriver.java | 14 +-
.../plc4x/java/s7/connection/S7PlcConnection.java | 179 ++++-----
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 1 +
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 2 +-
.../s7/netty/model/types/HeaderErrorClass.java | 15 +
.../java/s7/netty/model/types/ParameterError.java | 15 +
.../java/isoontcp/netty/IsoOnTcpProtocolTest.java | 37 +-
.../plc4x/java/isotp/netty/IsoTPProtocolTest.java | 405 +++++++++++----------
.../java/isotp/netty/model/IsoTPMessageTests.java | 21 +-
.../isotp/netty/model/params/ParameterTests.java | 36 +-
.../netty/model/params/TsapParameterTests.java | 42 +--
.../isotp/netty/model/tpdus/IsotpModelTests.java | 113 +++---
.../isotp/netty/model/types/IsotpTypeTests.java | 166 ++++++---
.../plc4x/java/netty/events/S7StateTests.java | 21 +-
.../org/apache/plc4x/java/s7/S7PlcDriverTest.java | 45 ++-
.../apache/plc4x/java/s7/S7PlcReaderSample.java | 99 +++--
.../java/s7/connection/S7PlcConnectionIT.java | 74 ++++
.../java/s7/connection/S7PlcConnectionTests.java | 79 ++--
.../java/s7/connection/S7PlcTestConnection.java | 189 ++++++++++
.../apache/plc4x/java/s7/model/S7AddressTests.java | 39 +-
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 83 +++--
.../apache/plc4x/java/s7/netty/S7ProtocolTest.java | 15 +-
.../s7/netty/model/messages/S7MessageTests.java | 103 +++---
.../s7/netty/model/params/S7ParameterTests.java | 39 +-
.../s7/netty/model/payloads/S7PayloadTests.java | 29 +-
.../java/s7/netty/model/types/S7TypeTests.java | 119 +++---
.../s7/connection/iso-tp-connect-response.pcap | Bin 0 -> 116 bytes
.../s7-setup-communication-response.pcap | Bin 0 -> 121 bytes
plc4j/utils/pom.xml | 1 +
plc4j/utils/raw-sockets/pom.xml | 6 -
.../plc4x/java/utils/rawsockets/RawSocket.java | 28 +-
.../utils/rawsockets/netty/RawSocketChannel.java | 34 +-
.../rawsockets/netty/RawSocketChannelConfig.java} | 24 +-
.../rawsockets/netty/RawSocketChannelOption.java} | 21 +-
plc4j/{api => utils/test-utils}/pom.xml | 10 +-
.../java/org/apache/plc4x/test/FastTests.java} | 22 +-
.../test-utils/src/main/resources/logback.xml} | 40 +-
pom.xml | 87 ++---
89 files changed, 2414 insertions(+), 1566 deletions(-)
diff --cc plc4j/protocols/pom.xml
index b3ec6a8,92d8ee0..dae2708
--- a/plc4j/protocols/pom.xml
+++ b/plc4j/protocols/pom.xml
@@@ -35,7 -35,7 +35,8 @@@
<description>Wrapper project for all PLC4J protocol
implementations.</description>
<modules>
+ <module>ads</module>
+ <module>driver-base</module>
<module>s7</module>
</modules>
--
To stop receiving notification emails like this one, please contact
sru...@apache.org.
