You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by jf...@apache.org on 2019/12/18 13:10:18 UTC
[plc4x] branch next-gen-core updated: Imported all Transports
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a commit to branch next-gen-core
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/next-gen-core by this push:
new 42506b8 Imported all Transports
42506b8 is described below
commit 42506b8f5a1dd970568b4d30deab79cc6fb0a651
Author: Julian Feinauer <j....@pragmaticminds.de>
AuthorDate: Wed Dec 18 14:10:13 2019 +0100
Imported all Transports
---
plc4j/transports/pcap-socket/pom.xml | 12 +++++++++---
.../plc4x/java/base/connection/PcapChannelFactory.java | 1 +
plc4j/transports/pom.xml | 10 +++++-----
plc4j/transports/raw-socket/pom.xml | 12 +++++++++---
.../plc4x/java/base/connection/RawSocketChannelFactory.java | 11 +++++++++--
plc4j/transports/serial/pom.xml | 12 +++++++++---
plc4j/transports/test/pom.xml | 12 +++++++++---
plc4j/transports/udp/pom.xml | 12 +++++++++---
.../plc4x/java/base/connection/UdpSocketChannelFactory.java | 1 +
9 files changed, 61 insertions(+), 22 deletions(-)
diff --git a/plc4j/transports/pcap-socket/pom.xml b/plc4j/transports/pcap-socket/pom.xml
index a899e14..b1b3cb4 100644
--- a/plc4j/transports/pcap-socket/pom.xml
+++ b/plc4j/transports/pcap-socket/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocols-driver-bases</artifactId>
+ <artifactId>plc4j-transports</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>plc4j-protocol-driver-base-pcap-socket</artifactId>
- <name>PLC4J: Protocol: Driver-Base: PCAP</name>
+ <artifactId>plc4j-transport-pcap-spocket</artifactId>
+ <name>PLC4J: Transport: PCAP</name>
<description>Base classes needed to implement plc4x drivers based on an simulated network device using a PCAP capture file to simulate network trafic.</description>
<dependencies>
@@ -58,6 +58,12 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-spi</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/plc4j/transports/pcap-socket/src/main/java/org/apache/plc4x/java/base/connection/PcapChannelFactory.java b/plc4j/transports/pcap-socket/src/main/java/org/apache/plc4x/java/base/connection/PcapChannelFactory.java
index 6731a76..1eb8b74 100644
--- a/plc4j/transports/pcap-socket/src/main/java/org/apache/plc4x/java/base/connection/PcapChannelFactory.java
+++ b/plc4j/transports/pcap-socket/src/main/java/org/apache/plc4x/java/base/connection/PcapChannelFactory.java
@@ -28,6 +28,7 @@ import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.spi.connection.ChannelFactory;
import org.apache.plc4x.java.utils.pcapsockets.netty.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/plc4j/transports/pom.xml b/plc4j/transports/pom.xml
index 4217007..78560e6 100644
--- a/plc4j/transports/pom.xml
+++ b/plc4j/transports/pom.xml
@@ -34,12 +34,12 @@
<description>Collection of base-types for implementing different types of drivers.</description>
<modules>
-<!-- <module>pcap-socket</module>-->
-<!-- <module>raw-socket</module>-->
-<!-- <module>serial</module>-->
+ <module>pcap-socket</module>
+ <module>raw-socket</module>
+ <module>serial</module>
<module>tcp</module>
-<!-- <module>udp</module>-->
-<!-- <module>test</module>-->
+ <module>udp</module>
+ <module>test</module>
</modules>
</project>
\ No newline at end of file
diff --git a/plc4j/transports/raw-socket/pom.xml b/plc4j/transports/raw-socket/pom.xml
index 066edd0..a2652eb 100644
--- a/plc4j/transports/raw-socket/pom.xml
+++ b/plc4j/transports/raw-socket/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocols-driver-bases</artifactId>
+ <artifactId>plc4j-transports</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>plc4j-protocol-driver-base-raw-socket</artifactId>
- <name>PLC4J: Protocol: Driver-Base: Raw Socket</name>
+ <artifactId>plc4j-transport-raw-socket</artifactId>
+ <name>PLC4J: Transports: Raw Socket</name>
<description>Base classes needed to implement plc4x drivers based on Raw Socket connections.</description>
<dependencies>
@@ -58,6 +58,12 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-spi</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/plc4j/transports/raw-socket/src/main/java/org/apache/plc4x/java/base/connection/RawSocketChannelFactory.java b/plc4j/transports/raw-socket/src/main/java/org/apache/plc4x/java/base/connection/RawSocketChannelFactory.java
index 5ba44c6..16a287f 100644
--- a/plc4j/transports/raw-socket/src/main/java/org/apache/plc4x/java/base/connection/RawSocketChannelFactory.java
+++ b/plc4j/transports/raw-socket/src/main/java/org/apache/plc4x/java/base/connection/RawSocketChannelFactory.java
@@ -19,13 +19,20 @@ under the License.
package org.apache.plc4x.java.base.connection;
import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.*;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.EventLoopGroup;
import io.netty.channel.oio.OioEventLoopGroup;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.utils.rawsockets.netty.*;
+import org.apache.plc4x.java.spi.connection.ChannelFactory;
+import org.apache.plc4x.java.utils.rawsockets.netty.PacketHandler;
+import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketChannel;
+import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketChannelOption;
+import org.apache.plc4x.java.utils.rawsockets.netty.RawSocketIpAddress;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/plc4j/transports/serial/pom.xml b/plc4j/transports/serial/pom.xml
index 0a19730..90d5773 100644
--- a/plc4j/transports/serial/pom.xml
+++ b/plc4j/transports/serial/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocols-driver-bases</artifactId>
+ <artifactId>plc4j-transports</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>plc4j-protocol-driver-base-serial</artifactId>
- <name>PLC4J: Protocol: Driver-Base: Serial</name>
+ <artifactId>plc4j-trannsport-serial</artifactId>
+ <name>PLC4J: Transport: Serial</name>
<description>Base classes needed to implement plc4x drivers based on Serial connections.</description>
<dependencies>
@@ -72,6 +72,12 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-spi</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/plc4j/transports/test/pom.xml b/plc4j/transports/test/pom.xml
index a6e6087..3050db9 100644
--- a/plc4j/transports/test/pom.xml
+++ b/plc4j/transports/test/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocols-driver-bases</artifactId>
+ <artifactId>plc4j-transports</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>plc4j-protocol-driver-base-test</artifactId>
- <name>PLC4J: Protocol: Driver-Base: Test</name>
+ <artifactId>plc4j-transport-test</artifactId>
+ <name>PLC4J: Transport: Test</name>
<description>Base classes needed to implement plc4x drivers for testing using internal byte streams.</description>
<dependencies>
@@ -88,6 +88,12 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-spi</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/plc4j/transports/udp/pom.xml b/plc4j/transports/udp/pom.xml
index 33813d1..9d49b65 100644
--- a/plc4j/transports/udp/pom.xml
+++ b/plc4j/transports/udp/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocols-driver-bases</artifactId>
+ <artifactId>plc4j-transports</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>plc4j-protocol-driver-base-udp</artifactId>
- <name>PLC4J: Protocol: Driver-Base: UDP</name>
+ <artifactId>plc4j-transport-udp</artifactId>
+ <name>PLC4J: Transport: UDP</name>
<description>Base classes needed to implement plc4x drivers based on UDP connections.</description>
<dependencies>
@@ -61,6 +61,12 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-spi</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/plc4j/transports/udp/src/main/java/org/apache/plc4x/java/base/connection/UdpSocketChannelFactory.java b/plc4j/transports/udp/src/main/java/org/apache/plc4x/java/base/connection/UdpSocketChannelFactory.java
index 942afc4..22dbe86 100644
--- a/plc4j/transports/udp/src/main/java/org/apache/plc4x/java/base/connection/UdpSocketChannelFactory.java
+++ b/plc4j/transports/udp/src/main/java/org/apache/plc4x/java/base/connection/UdpSocketChannelFactory.java
@@ -28,6 +28,7 @@ import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.exceptions.PlcException;
+import org.apache.plc4x.java.spi.connection.ChannelFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;