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/12/18 14:05:50 UTC
[plc4x] branch next-gen-core updated (4877747 -> 5b11e35)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch next-gen-core
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from 4877747 readded benchmarks after refactoring
new 51d8382 - Updated the build after the moving of packages
new 5b11e35 - Updated the build after the moving of packages
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:
plc4j/drivers/pom.xml | 2 +-
plc4j/drivers/s7/pom.xml | 7 ++++++-
.../plc4x/java/s7/connection/S7PlcConnection.java | 18 +++++++++---------
plc4j/protocols/iso-on-tcp/pom.xml | 6 +++++-
plc4j/protocols/iso-tp/pom.xml | 5 +++++
plc4j/protocols/pom.xml | 6 +++---
plc4j/protocols/s7/pom.xml | 5 +++++
.../apache/plc4x/java/s7/netty/Plc4XS7Protocol.java | 2 ++
.../plc4x/java/s7/netty/util/S7PlcFieldHandler.java | 3 ++-
.../plc4x/java/s7/netty/Plc4XS7ProtocolSpec.groovy | 7 +++++++
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 1 +
.../java/s7/netty/util/S7PlcFieldHandlerTest.java | 1 +
plc4j/spi/pom.xml | 16 ++++++++++------
sandbox/test-java-amsads-driver/pom.xml | 2 +-
.../amsads/connection/AdsAbstractPlcConnection.java | 1 +
.../java/amsads/connection/AdsTcpPlcConnection.java | 1 +
.../plc4x/java/amsads/model/AdsPlcFieldHandler.java | 1 +
.../plc4x/java/amsads/protocol/Plc4x2AdsProtocol.java | 1 +
.../java/amsads/protocol/util/LittleEndianDecoder.java | 1 +
sandbox/test-java-bacnetip-driver/pom.xml | 4 ++--
.../connection/PassiveBacNetIpPlcConnection.java | 4 ++--
.../java/bacnetip/PassiveBacNetIpDriverManual.java | 2 +-
sandbox/test-java-df1-driver/pom.xml | 2 +-
.../plc4x/java/df1/connection/SerialDf1Connection.java | 1 +
sandbox/test-java-knxnetip-driver-passive/pom.xml | 2 +-
.../connection/PassiveKnxNetIpPlcConnection.java | 3 ++-
sandbox/test-java-knxnetip-driver/pom.xml | 6 +++---
.../java/knxnetip/connection/KnxNetIpConnection.java | 5 +++--
.../plc4x/java/knxnetip/ManualKnxNetIpWithEts5.java | 2 +-
sandbox/test-java-s7-driver-passive/pom.xml | 2 +-
.../s7/connection/PassiveS7PlcConnection.java | 2 +-
sandbox/test-streampipes-plc4x-adapters/pom.xml | 4 ++--
.../adapters/source/bacnetip/BacNetIpAdapter.java | 4 ++--
.../adapters/source/knxnetip/KnxNetIpAdapter.java | 2 +-
34 files changed, 87 insertions(+), 44 deletions(-)
[plc4x] 02/02: - Updated the build after the moving of packages
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch next-gen-core
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 5b11e35821487737de2a2e1146e849cf3ca1f092
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Dec 18 15:05:43 2019 +0100
- Updated the build after the moving of packages
---
plc4j/protocols/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/plc4j/protocols/pom.xml b/plc4j/protocols/pom.xml
index eee519e..93b6e32 100644
--- a/plc4j/protocols/pom.xml
+++ b/plc4j/protocols/pom.xml
@@ -37,10 +37,10 @@
<module>ads</module>
<!-- <module>delta-v</module>-->
<module>ethernet-ip</module>
-<!-- <module>iso-on-tcp</module>-->
-<!-- <module>iso-tp</module>-->
+ <module>iso-on-tcp</module>
+ <module>iso-tp</module>
<module>modbus</module>
-<!-- <module>s7</module>-->
+ <module>s7</module>
<module>benchmarks</module>
</modules>
[plc4x] 01/02: - Updated the build after the moving of packages
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch next-gen-core
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 51d8382937e52e67e0ce5237f81f881a7c1d762b
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Dec 18 15:04:32 2019 +0100
- Updated the build after the moving of packages
---
plc4j/drivers/pom.xml | 2 +-
plc4j/drivers/s7/pom.xml | 7 ++++++-
.../plc4x/java/s7/connection/S7PlcConnection.java | 18 +++++++++---------
plc4j/protocols/iso-on-tcp/pom.xml | 6 +++++-
plc4j/protocols/iso-tp/pom.xml | 5 +++++
plc4j/protocols/s7/pom.xml | 5 +++++
.../apache/plc4x/java/s7/netty/Plc4XS7Protocol.java | 2 ++
.../plc4x/java/s7/netty/util/S7PlcFieldHandler.java | 3 ++-
.../plc4x/java/s7/netty/Plc4XS7ProtocolSpec.groovy | 7 +++++++
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 1 +
.../java/s7/netty/util/S7PlcFieldHandlerTest.java | 1 +
plc4j/spi/pom.xml | 16 ++++++++++------
sandbox/test-java-amsads-driver/pom.xml | 2 +-
.../amsads/connection/AdsAbstractPlcConnection.java | 1 +
.../java/amsads/connection/AdsTcpPlcConnection.java | 1 +
.../plc4x/java/amsads/model/AdsPlcFieldHandler.java | 1 +
.../plc4x/java/amsads/protocol/Plc4x2AdsProtocol.java | 1 +
.../java/amsads/protocol/util/LittleEndianDecoder.java | 1 +
sandbox/test-java-bacnetip-driver/pom.xml | 4 ++--
.../connection/PassiveBacNetIpPlcConnection.java | 4 ++--
.../java/bacnetip/PassiveBacNetIpDriverManual.java | 2 +-
sandbox/test-java-df1-driver/pom.xml | 2 +-
.../plc4x/java/df1/connection/SerialDf1Connection.java | 1 +
sandbox/test-java-knxnetip-driver-passive/pom.xml | 2 +-
.../connection/PassiveKnxNetIpPlcConnection.java | 3 ++-
sandbox/test-java-knxnetip-driver/pom.xml | 6 +++---
.../java/knxnetip/connection/KnxNetIpConnection.java | 5 +++--
.../plc4x/java/knxnetip/ManualKnxNetIpWithEts5.java | 2 +-
sandbox/test-java-s7-driver-passive/pom.xml | 2 +-
.../s7/connection/PassiveS7PlcConnection.java | 2 +-
sandbox/test-streampipes-plc4x-adapters/pom.xml | 4 ++--
.../adapters/source/bacnetip/BacNetIpAdapter.java | 4 ++--
.../adapters/source/knxnetip/KnxNetIpAdapter.java | 2 +-
33 files changed, 84 insertions(+), 41 deletions(-)
diff --git a/plc4j/drivers/pom.xml b/plc4j/drivers/pom.xml
index 9eebcb7..56337d0 100644
--- a/plc4j/drivers/pom.xml
+++ b/plc4j/drivers/pom.xml
@@ -38,7 +38,7 @@
<module>ads</module>
<module>ethernet-ip</module>
<module>modbus</module>
-<!-- <module>s7</module>-->
+ <module>s7</module>
<module>simulated</module>
<module>opcua</module>
</modules>
diff --git a/plc4j/drivers/s7/pom.xml b/plc4j/drivers/s7/pom.xml
index a41bb16..1ffd845 100644
--- a/plc4j/drivers/s7/pom.xml
+++ b/plc4j/drivers/s7/pom.xml
@@ -37,6 +37,11 @@
<artifactId>plc4j-api</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-spi</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
@@ -88,7 +93,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocol-driver-base-test</artifactId>
+ <artifactId>plc4j-transport-test</artifactId>
<version>0.6.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
index 274d4d7..e26fbf8 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
@@ -30,8 +30,16 @@ import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.api.messages.PlcWriteResponse;
import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.s7.model.S7Field;
+import org.apache.plc4x.java.s7.netty.Plc4XS7Protocol;
+import org.apache.plc4x.java.s7.netty.S7Protocol;
+import org.apache.plc4x.java.s7.netty.strategies.DefaultS7MessageProcessor;
+import org.apache.plc4x.java.s7.netty.util.S7PlcFieldHandler;
+import org.apache.plc4x.java.s7.types.S7ControllerType;
+import org.apache.plc4x.java.s7.utils.S7TsapIdEncoder;
import org.apache.plc4x.java.spi.connection.ChannelFactory;
import org.apache.plc4x.java.spi.connection.NettyPlcConnection;
+import org.apache.plc4x.java.spi.messages.*;
import org.apache.plc4x.java.tcp.connection.TcpSocketChannelFactory;
import org.apache.plc4x.java.spi.events.ConnectEvent;
import org.apache.plc4x.java.spi.events.ConnectedEvent;
@@ -41,14 +49,6 @@ import org.apache.plc4x.java.isotp.protocol.model.tpdus.DisconnectRequestTpdu;
import org.apache.plc4x.java.isotp.protocol.model.types.DeviceGroup;
import org.apache.plc4x.java.isotp.protocol.model.types.DisconnectReason;
import org.apache.plc4x.java.isotp.protocol.model.types.TpduSize;
-import org.apache.plc4x.java.s7.model.S7Field;
-import org.apache.plc4x.java.s7.netty.Plc4XS7Protocol;
-import org.apache.plc4x.java.s7.netty.S7Protocol;
-import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
-import org.apache.plc4x.java.s7.netty.strategies.DefaultS7MessageProcessor;
-import org.apache.plc4x.java.s7.netty.util.S7PlcFieldHandler;
-import org.apache.plc4x.java.s7.types.S7ControllerType;
-import org.apache.plc4x.java.s7.utils.S7TsapIdEncoder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -75,7 +75,7 @@ import java.util.concurrent.TimeoutException;
* {memory area}/{byte offset}/{bit offset}
* </pre>
* where the {bit-offset} is optional.
- * All Available Memory Areas for this mode are defined in the {@link MemoryArea} enum.
+ * All Available Memory Areas for this mode are defined in the MemoryArea enum.
*/
public class S7PlcConnection extends NettyPlcConnection implements PlcReader, PlcWriter {
diff --git a/plc4j/protocols/iso-on-tcp/pom.xml b/plc4j/protocols/iso-on-tcp/pom.xml
index ef983a7..ef3e738 100644
--- a/plc4j/protocols/iso-on-tcp/pom.xml
+++ b/plc4j/protocols/iso-on-tcp/pom.xml
@@ -37,7 +37,11 @@
<artifactId>plc4j-api</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-spi</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>io.netty</groupId>
diff --git a/plc4j/protocols/iso-tp/pom.xml b/plc4j/protocols/iso-tp/pom.xml
index abfb655..5f908e7 100644
--- a/plc4j/protocols/iso-tp/pom.xml
+++ b/plc4j/protocols/iso-tp/pom.xml
@@ -37,6 +37,11 @@
<artifactId>plc4j-api</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-spi</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
diff --git a/plc4j/protocols/s7/pom.xml b/plc4j/protocols/s7/pom.xml
index 5562182..dae6eb5 100644
--- a/plc4j/protocols/s7/pom.xml
+++ b/plc4j/protocols/s7/pom.xml
@@ -37,6 +37,11 @@
<artifactId>plc4j-api</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-spi</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
index 0e80593..f640dd9 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
@@ -44,6 +44,8 @@ import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem;
import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
import org.apache.plc4x.java.s7.netty.model.types.*;
+import org.apache.plc4x.java.spi.messages.*;
+import org.apache.plc4x.java.spi.messages.items.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java
index 5952879..47d364e 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java
@@ -21,8 +21,9 @@ package org.apache.plc4x.java.s7.netty.util;
import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.spi.connection.DefaultPlcFieldHandler;
import org.apache.plc4x.java.s7.model.S7Field;
+import org.apache.plc4x.java.spi.connection.DefaultPlcFieldHandler;
+import org.apache.plc4x.java.spi.messages.items.*;
import java.lang.reflect.InvocationTargetException;
import java.math.BigInteger;
diff --git a/plc4j/protocols/s7/src/test/groovy/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolSpec.groovy b/plc4j/protocols/s7/src/test/groovy/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolSpec.groovy
index ceb00c6..18779f9 100644
--- a/plc4j/protocols/s7/src/test/groovy/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolSpec.groovy
+++ b/plc4j/protocols/s7/src/test/groovy/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolSpec.groovy
@@ -41,6 +41,13 @@ import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload
import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem
import org.apache.plc4x.java.s7.netty.model.types.*
import org.apache.plc4x.java.s7.netty.util.S7PlcFieldHandler
+import org.apache.plc4x.java.spi.messages.DefaultPlcReadRequest
+import org.apache.plc4x.java.spi.messages.DefaultPlcWriteRequest
+import org.apache.plc4x.java.spi.messages.InternalPlcReadRequest
+import org.apache.plc4x.java.spi.messages.InternalPlcWriteRequest
+import org.apache.plc4x.java.spi.messages.PlcReader
+import org.apache.plc4x.java.spi.messages.PlcRequestContainer
+import org.apache.plc4x.java.spi.messages.PlcWriter
import spock.lang.Specification
import spock.lang.Unroll
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java
index fe926bb..538b629 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java
@@ -36,6 +36,7 @@ import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
import org.apache.plc4x.java.s7.netty.model.types.*;
import org.apache.plc4x.java.s7.netty.util.S7PlcFieldHandler;
+import org.apache.plc4x.java.spi.messages.*;
import org.junit.Before;
import org.junit.Test;
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandlerTest.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandlerTest.java
index 3072990..e7263e2 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandlerTest.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandlerTest.java
@@ -21,6 +21,7 @@ package org.apache.plc4x.java.s7.netty.util;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.model.PlcField;
import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
+import org.apache.plc4x.java.spi.messages.items.*;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
diff --git a/plc4j/spi/pom.xml b/plc4j/spi/pom.xml
index c2622c6..1f7a8b9 100644
--- a/plc4j/spi/pom.xml
+++ b/plc4j/spi/pom.xml
@@ -21,18 +21,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>plc4j</artifactId>
<groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>plc4j-spi</artifactId>
+ <name>PLC4J: SPI</name>
+ <description>Internal API Module.</description>
+
<dependencies>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
+ <artifactId>netty-buffer</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -40,12 +44,13 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
+ <artifactId>netty-common</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
+ <artifactId>netty-transport</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
@@ -58,5 +63,4 @@
</dependency>
</dependencies>
-
</project>
\ No newline at end of file
diff --git a/sandbox/test-java-amsads-driver/pom.xml b/sandbox/test-java-amsads-driver/pom.xml
index b489a9d..d408a43 100644
--- a/sandbox/test-java-amsads-driver/pom.xml
+++ b/sandbox/test-java-amsads-driver/pom.xml
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocol-driver-base-serial</artifactId>
+ <artifactId>plc4j-trannsport-serial</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/connection/AdsAbstractPlcConnection.java b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/connection/AdsAbstractPlcConnection.java
index 059ab92..d3ea5b5 100644
--- a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/connection/AdsAbstractPlcConnection.java
+++ b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/connection/AdsAbstractPlcConnection.java
@@ -30,6 +30,7 @@ import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.spi.connection.ChannelFactory;
import org.apache.plc4x.java.spi.connection.NettyPlcConnection;
+import org.apache.plc4x.java.spi.messages.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/connection/AdsTcpPlcConnection.java b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/connection/AdsTcpPlcConnection.java
index 9db9f04..3c2d1e9 100644
--- a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/connection/AdsTcpPlcConnection.java
+++ b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/connection/AdsTcpPlcConnection.java
@@ -36,6 +36,7 @@ import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
import org.apache.plc4x.java.api.model.PlcField;
import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.spi.messages.*;
import org.apache.plc4x.java.spi.messages.items.BaseDefaultFieldItem;
import org.apache.plc4x.java.spi.model.DefaultPlcConsumerRegistration;
import org.apache.plc4x.java.spi.model.InternalPlcConsumerRegistration;
diff --git a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/model/AdsPlcFieldHandler.java b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/model/AdsPlcFieldHandler.java
index 3d48ec5..4965711 100644
--- a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/model/AdsPlcFieldHandler.java
+++ b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/model/AdsPlcFieldHandler.java
@@ -22,6 +22,7 @@ import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.model.PlcField;
import org.apache.plc4x.java.spi.connection.DefaultPlcFieldHandler;
+import org.apache.plc4x.java.spi.messages.items.*;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/protocol/Plc4x2AdsProtocol.java b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/protocol/Plc4x2AdsProtocol.java
index 0dd311c..2ce1587 100644
--- a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/protocol/Plc4x2AdsProtocol.java
+++ b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/protocol/Plc4x2AdsProtocol.java
@@ -37,6 +37,7 @@ import org.apache.plc4x.java.api.messages.PlcRequest;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.api.model.PlcField;
import org.apache.plc4x.java.api.types.PlcResponseCode;
+import org.apache.plc4x.java.spi.messages.*;
import org.apache.plc4x.java.spi.messages.items.BaseDefaultFieldItem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/protocol/util/LittleEndianDecoder.java b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/protocol/util/LittleEndianDecoder.java
index 71a99e2..26c44ea 100644
--- a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/protocol/util/LittleEndianDecoder.java
+++ b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/protocol/util/LittleEndianDecoder.java
@@ -24,6 +24,7 @@ import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.NotImplementedException;
import org.apache.plc4x.java.amsads.model.AdsDataType;
import org.apache.plc4x.java.api.exceptions.PlcUnsupportedDataTypeException;
+import org.apache.plc4x.java.spi.messages.items.*;
import java.io.ByteArrayOutputStream;
import java.math.BigInteger;
diff --git a/sandbox/test-java-bacnetip-driver/pom.xml b/sandbox/test-java-bacnetip-driver/pom.xml
index b43815e..daffa9a 100644
--- a/sandbox/test-java-bacnetip-driver/pom.xml
+++ b/sandbox/test-java-bacnetip-driver/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocol-driver-base-raw-socket</artifactId>
+ <artifactId>plc4j-transport-raw-socket</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
@@ -84,7 +84,7 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocol-driver-base-pcap-socket</artifactId>
+ <artifactId>plc4j-transport-pcap-spocket</artifactId>
<version>0.6.0-SNAPSHOT</version>
<!--scope>test</scope-->
</dependency>
diff --git a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/connection/PassiveBacNetIpPlcConnection.java b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/connection/PassiveBacNetIpPlcConnection.java
index dfb1627..01b9f1b 100644
--- a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/connection/PassiveBacNetIpPlcConnection.java
+++ b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/connection/PassiveBacNetIpPlcConnection.java
@@ -25,11 +25,11 @@ import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.model.PlcField;
import org.apache.plc4x.java.bacnetip.model.BacNetIpField;
import org.apache.plc4x.java.bacnetip.protocol.BacNetIpProtocol;
+import org.apache.plc4x.java.base.connection.RawSocketChannelFactory;
import org.apache.plc4x.java.spi.connection.ChannelFactory;
import org.apache.plc4x.java.spi.connection.NettyPlcConnection;
-import org.apache.plc4x.java.spi.connection.RawSocketChannelFactory;
-import org.apache.plc4x.java.spi.events.ConnectEvent;
import org.apache.plc4x.java.spi.events.ConnectedEvent;
+import org.apache.plc4x.java.spi.messages.*;
import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketAddress;
import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketIpAddress;
import org.apache.plc4x.java.utils.rawsockets.netty.UdpIpPacketHandler;
diff --git a/sandbox/test-java-bacnetip-driver/src/test/java/org/apache/plc4x/java/bacnetip/PassiveBacNetIpDriverManual.java b/sandbox/test-java-bacnetip-driver/src/test/java/org/apache/plc4x/java/bacnetip/PassiveBacNetIpDriverManual.java
index 326829b..aadab6d 100644
--- a/sandbox/test-java-bacnetip-driver/src/test/java/org/apache/plc4x/java/bacnetip/PassiveBacNetIpDriverManual.java
+++ b/sandbox/test-java-bacnetip-driver/src/test/java/org/apache/plc4x/java/bacnetip/PassiveBacNetIpDriverManual.java
@@ -20,8 +20,8 @@ package org.apache.plc4x.java.bacnetip;
import org.apache.plc4x.java.bacnetip.connection.PassiveBacNetIpPlcConnection;
import org.apache.plc4x.java.bacnetip.protocol.HelloWorldProtocol;
+import org.apache.plc4x.java.base.connection.PcapChannelFactory;
import org.apache.plc4x.java.spi.connection.NettyPlcConnection;
-import org.apache.plc4x.java.spi.connection.PcapChannelFactory;
import org.apache.plc4x.java.utils.pcapsockets.netty.PcapSocketAddress;
import org.apache.plc4x.java.utils.pcapsockets.netty.PcapSocketChannelConfig;
import org.apache.plc4x.java.utils.pcapsockets.netty.UdpIpPacketHandler;
diff --git a/sandbox/test-java-df1-driver/pom.xml b/sandbox/test-java-df1-driver/pom.xml
index 24dae98..b5a5d27 100644
--- a/sandbox/test-java-df1-driver/pom.xml
+++ b/sandbox/test-java-df1-driver/pom.xml
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocol-driver-base-serial</artifactId>
+ <artifactId>plc4j-trannsport-serial</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/connection/SerialDf1Connection.java b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/connection/SerialDf1Connection.java
index b181e99..c17b5ee 100644
--- a/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/connection/SerialDf1Connection.java
+++ b/sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/connection/SerialDf1Connection.java
@@ -30,6 +30,7 @@ import org.apache.plc4x.java.spi.events.ConnectedEvent;
import org.apache.plc4x.java.df1.protocol.Df1Protocol;
import org.apache.plc4x.java.df1.protocol.Plc4XDf1Protocol;
import org.apache.plc4x.java.df1.util.Df1FieldHandler;
+import org.apache.plc4x.java.spi.messages.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/sandbox/test-java-knxnetip-driver-passive/pom.xml b/sandbox/test-java-knxnetip-driver-passive/pom.xml
index cf0af08..c051e45 100644
--- a/sandbox/test-java-knxnetip-driver-passive/pom.xml
+++ b/sandbox/test-java-knxnetip-driver-passive/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocol-driver-base-raw-socket</artifactId>
+ <artifactId>plc4j-transport-raw-socket</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/sandbox/test-java-knxnetip-driver-passive/src/main/java/org/apache/plc4x/java/passive/knxnetip/connection/PassiveKnxNetIpPlcConnection.java b/sandbox/test-java-knxnetip-driver-passive/src/main/java/org/apache/plc4x/java/passive/knxnetip/connection/PassiveKnxNetIpPlcConnection.java
index 132220b..b07c396 100644
--- a/sandbox/test-java-knxnetip-driver-passive/src/main/java/org/apache/plc4x/java/passive/knxnetip/connection/PassiveKnxNetIpPlcConnection.java
+++ b/sandbox/test-java-knxnetip-driver-passive/src/main/java/org/apache/plc4x/java/passive/knxnetip/connection/PassiveKnxNetIpPlcConnection.java
@@ -23,12 +23,13 @@ import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.RawSocketChannelFactory;
import org.apache.plc4x.java.spi.connection.ChannelFactory;
import org.apache.plc4x.java.spi.connection.NettyPlcConnection;
-import org.apache.plc4x.java.spi.connection.RawSocketChannelFactory;
import org.apache.plc4x.java.spi.events.ConnectedEvent;
import org.apache.plc4x.java.passive.knxnetip.model.KnxNetIpField;
import org.apache.plc4x.java.passive.knxnetip.protocol.KnxNetIpProtocol;
+import org.apache.plc4x.java.spi.messages.*;
import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketAddress;
import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketIpAddress;
import org.apache.plc4x.java.utils.rawsockets.netty.UdpIpPacketHandler;
diff --git a/sandbox/test-java-knxnetip-driver/pom.xml b/sandbox/test-java-knxnetip-driver/pom.xml
index 86ec7cb..b0eb8f1 100644
--- a/sandbox/test-java-knxnetip-driver/pom.xml
+++ b/sandbox/test-java-knxnetip-driver/pom.xml
@@ -67,12 +67,12 @@
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocol-driver-base-udp</artifactId>
+ <artifactId>plc4j-transport-udp</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocol-driver-base-raw-socket</artifactId>
+ <artifactId>plc4j-transport-raw-socket</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
@@ -89,7 +89,7 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocol-driver-base-pcap-socket</artifactId>
+ <artifactId>plc4j-transport-pcap-spocket</artifactId>
<version>0.6.0-SNAPSHOT</version>
<!--scope>test</scope-->
</dependency>
diff --git a/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/connection/KnxNetIpConnection.java b/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/connection/KnxNetIpConnection.java
index b1aad53..b87dd60 100644
--- a/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/connection/KnxNetIpConnection.java
+++ b/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/connection/KnxNetIpConnection.java
@@ -23,16 +23,17 @@ import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.UdpSocketChannelFactory;
+import org.apache.plc4x.java.base.connection.protocol.DatagramUnpackingHandler;
import org.apache.plc4x.java.spi.connection.ChannelFactory;
import org.apache.plc4x.java.spi.connection.NettyPlcConnection;
-import org.apache.plc4x.java.spi.connection.UdpSocketChannelFactory;
-import org.apache.plc4x.java.spi.connection.protocol.DatagramUnpackingHandler;
import org.apache.plc4x.java.spi.events.ConnectEvent;
import org.apache.plc4x.java.spi.events.ConnectedEvent;
import org.apache.plc4x.java.spi.events.DisconnectEvent;
import org.apache.plc4x.java.knxnetip.model.KnxNetIpField;
import org.apache.plc4x.java.knxnetip.protocol.KnxNetIpProtocolLogic;
import org.apache.plc4x.java.knxnetip.protocol.KnxNetIpProtocolPackets;
+import org.apache.plc4x.java.spi.messages.*;
import java.net.InetAddress;
import java.util.concurrent.CompletableFuture;
diff --git a/sandbox/test-java-knxnetip-driver/src/test/java/org/apache/plc4x/java/knxnetip/ManualKnxNetIpWithEts5.java b/sandbox/test-java-knxnetip-driver/src/test/java/org/apache/plc4x/java/knxnetip/ManualKnxNetIpWithEts5.java
index 7b7b73f..a743586 100644
--- a/sandbox/test-java-knxnetip-driver/src/test/java/org/apache/plc4x/java/knxnetip/ManualKnxNetIpWithEts5.java
+++ b/sandbox/test-java-knxnetip-driver/src/test/java/org/apache/plc4x/java/knxnetip/ManualKnxNetIpWithEts5.java
@@ -21,10 +21,10 @@ package org.apache.plc4x.java.knxnetip;
import io.netty.channel.ChannelHandlerContext;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.base.connection.UdpSocketChannelFactory;
import org.apache.plc4x.java.spi.PlcMessageToMessageCodec;
import org.apache.plc4x.java.spi.connection.ChannelFactory;
import org.apache.plc4x.java.spi.connection.NettyPlcConnection;
-import org.apache.plc4x.java.spi.connection.UdpSocketChannelFactory;
import org.apache.plc4x.java.spi.messages.PlcRequestContainer;
import org.apache.plc4x.java.ets5.passive.*;
import org.apache.plc4x.java.ets5.passive.io.KNXGroupAddressIO;
diff --git a/sandbox/test-java-s7-driver-passive/pom.xml b/sandbox/test-java-s7-driver-passive/pom.xml
index a47a6e8..c3704fd 100644
--- a/sandbox/test-java-s7-driver-passive/pom.xml
+++ b/sandbox/test-java-s7-driver-passive/pom.xml
@@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocol-driver-base-raw-socket</artifactId>
+ <artifactId>plc4j-transport-raw-socket</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/sandbox/test-java-s7-driver-passive/src/main/java/org/apache/plc4x/javapassive/s7/connection/PassiveS7PlcConnection.java b/sandbox/test-java-s7-driver-passive/src/main/java/org/apache/plc4x/javapassive/s7/connection/PassiveS7PlcConnection.java
index 5b38455..94a835d 100644
--- a/sandbox/test-java-s7-driver-passive/src/main/java/org/apache/plc4x/javapassive/s7/connection/PassiveS7PlcConnection.java
+++ b/sandbox/test-java-s7-driver-passive/src/main/java/org/apache/plc4x/javapassive/s7/connection/PassiveS7PlcConnection.java
@@ -23,10 +23,10 @@ import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.model.PlcField;
+import org.apache.plc4x.java.base.connection.RawSocketChannelFactory;
import org.apache.plc4x.java.spi.connection.ChannelFactory;
import org.apache.plc4x.java.spi.connection.DefaultPlcFieldHandler;
import org.apache.plc4x.java.spi.connection.NettyPlcConnection;
-import org.apache.plc4x.java.spi.connection.RawSocketChannelFactory;
import org.apache.plc4x.java.spi.events.ConnectedEvent;
import org.apache.plc4x.java.spi.messages.DefaultPlcReadRequest;
import org.apache.plc4x.java.spi.messages.PlcReader;
diff --git a/sandbox/test-streampipes-plc4x-adapters/pom.xml b/sandbox/test-streampipes-plc4x-adapters/pom.xml
index 50e71db..5868394 100644
--- a/sandbox/test-streampipes-plc4x-adapters/pom.xml
+++ b/sandbox/test-streampipes-plc4x-adapters/pom.xml
@@ -62,12 +62,12 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocol-driver-base-raw-socket</artifactId>
+ <artifactId>plc4j-transport-raw-socket</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocol-driver-base-pcap-socket</artifactId>
+ <artifactId>plc4j-transport-pcap-spocket</artifactId>
<version>0.6.0-SNAPSHOT</version>
<!--scope>test</scope-->
</dependency>
diff --git a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/bacnetip/BacNetIpAdapter.java b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/bacnetip/BacNetIpAdapter.java
index 64691c3..940a0dc 100644
--- a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/bacnetip/BacNetIpAdapter.java
+++ b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/bacnetip/BacNetIpAdapter.java
@@ -23,11 +23,11 @@ import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.bacnetip.PassiveBacNetIpDriver;
import org.apache.plc4x.java.bacnetip.connection.PassiveBacNetIpPlcConnection;
import org.apache.plc4x.java.bacnetip.readwrite.*;
+import org.apache.plc4x.java.base.connection.PcapChannelFactory;
+import org.apache.plc4x.java.base.connection.RawSocketChannelFactory;
import org.apache.plc4x.java.spi.PlcMessageToMessageCodec;
import org.apache.plc4x.java.spi.connection.ChannelFactory;
import org.apache.plc4x.java.spi.connection.NettyPlcConnection;
-import org.apache.plc4x.java.spi.connection.PcapChannelFactory;
-import org.apache.plc4x.java.spi.connection.RawSocketChannelFactory;
import org.apache.plc4x.java.spi.messages.PlcRequestContainer;
import org.apache.plc4x.java.utils.pcapsockets.netty.PcapSocketAddress;
import org.apache.plc4x.java.utils.pcapsockets.netty.PcapSocketChannelConfig;
diff --git a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/knxnetip/KnxNetIpAdapter.java b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/knxnetip/KnxNetIpAdapter.java
index 82ef621..3fddb36 100644
--- a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/knxnetip/KnxNetIpAdapter.java
+++ b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/knxnetip/KnxNetIpAdapter.java
@@ -21,10 +21,10 @@ package org.apache.plc4x.java.streampipes.adapters.source.knxnetip;
import io.netty.channel.ChannelHandlerContext;
import org.apache.commons.codec.binary.Hex;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.base.connection.UdpSocketChannelFactory;
import org.apache.plc4x.java.spi.PlcMessageToMessageCodec;
import org.apache.plc4x.java.spi.connection.ChannelFactory;
import org.apache.plc4x.java.spi.connection.NettyPlcConnection;
-import org.apache.plc4x.java.spi.connection.UdpSocketChannelFactory;
import org.apache.plc4x.java.spi.messages.PlcRequestContainer;
import org.apache.plc4x.java.knxnetip.connection.KnxNetIpConnection;
import org.apache.plc4x.java.knxnetip.readwrite.*;