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/10/21 14:02:59 UTC
[plc4x] 01/02: - Moved the AB-ETH driver out of the sandbox
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit f67777b25767d69c7a11c19e94d1a2a9afff31e9
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Oct 21 16:02:37 2019 +0200
- Moved the AB-ETH driver out of the sandbox
---
.../test-java-ab-eth-driver => plc4j/drivers/ab-eth}/pom.xml | 10 +++++-----
.../src/main/java/org/apache/plc4x/java/abeth/AbEthDriver.java | 0
.../apache/plc4x/java/abeth/connection/AbEthFieldHandler.java | 0
.../apache/plc4x/java/abeth/connection/AbEthPlcConnection.java | 0
.../java/org/apache/plc4x/java/abeth/model/AbEthField.java | 0
.../java/org/apache/plc4x/java/abeth/model/types/FileType.java | 0
.../org/apache/plc4x/java/abeth/protocol/AbEthProtocol.java | 0
.../apache/plc4x/java/abeth/protocol/Plc4xAbEthProtocol.java | 0
.../META-INF/services/org.apache.plc4x.java.spi.PlcDriver | 0
.../test/java/org/apache/plc4x/protocol/abeth/AbEthTest.java | 0
.../ab-eth}/src/test/resources/testsuite/AbEthTestsuite.xml | 0
plc4j/drivers/pom.xml | 1 +
plc4j/karaf-features/pom.xml | 2 --
sandbox/pom.xml | 1 -
14 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/sandbox/test-java-ab-eth-driver/pom.xml b/plc4j/drivers/ab-eth/pom.xml
similarity index 92%
rename from sandbox/test-java-ab-eth-driver/pom.xml
rename to plc4j/drivers/ab-eth/pom.xml
index 895b791..39e3ddb 100644
--- a/sandbox/test-java-ab-eth-driver/pom.xml
+++ b/plc4j/drivers/ab-eth/pom.xml
@@ -23,14 +23,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plc4x.sandbox</groupId>
- <artifactId>plc4x-sandbox</artifactId>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-drivers</artifactId>
<version>0.5.0-SNAPSHOT</version>
</parent>
- <artifactId>test-java-ab-eth-driver</artifactId>
-
- <name>Sandbox: Test Generated AB-ETH Driver</name>
+ <artifactId>plc4j-driver-ab-eth</artifactId>
+ <name>PLC4J: Driver: AB-ETH</name>
+ <description>Implementation of a PLC4X driver able to speak using the Allen Bradley AB-ETH protocol.</description>
<build>
<plugins>
diff --git a/sandbox/test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/AbEthDriver.java b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/AbEthDriver.java
similarity index 100%
rename from sandbox/test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/AbEthDriver.java
rename to plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/AbEthDriver.java
diff --git a/sandbox/test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthFieldHandler.java b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthFieldHandler.java
similarity index 100%
rename from sandbox/test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthFieldHandler.java
rename to plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthFieldHandler.java
diff --git a/sandbox/test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthPlcConnection.java b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthPlcConnection.java
similarity index 100%
rename from sandbox/test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthPlcConnection.java
rename to plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthPlcConnection.java
diff --git a/sandbox/test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/model/AbEthField.java b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/model/AbEthField.java
similarity index 100%
rename from sandbox/test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/model/AbEthField.java
rename to plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/model/AbEthField.java
diff --git a/sandbox/test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/model/types/FileType.java b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/model/types/FileType.java
similarity index 100%
rename from sandbox/test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/model/types/FileType.java
rename to plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/model/types/FileType.java
diff --git a/sandbox/test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/protocol/AbEthProtocol.java b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/AbEthProtocol.java
similarity index 100%
rename from sandbox/test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/protocol/AbEthProtocol.java
rename to plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/AbEthProtocol.java
diff --git a/sandbox/test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/protocol/Plc4xAbEthProtocol.java b/plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/Plc4xAbEthProtocol.java
similarity index 100%
rename from sandbox/test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/protocol/Plc4xAbEthProtocol.java
rename to plc4j/drivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/protocol/Plc4xAbEthProtocol.java
diff --git a/sandbox/test-java-ab-eth-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver b/plc4j/drivers/ab-eth/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
similarity index 100%
rename from sandbox/test-java-ab-eth-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
rename to plc4j/drivers/ab-eth/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
diff --git a/sandbox/test-java-ab-eth-driver/src/test/java/org/apache/plc4x/protocol/abeth/AbEthTest.java b/plc4j/drivers/ab-eth/src/test/java/org/apache/plc4x/protocol/abeth/AbEthTest.java
similarity index 100%
rename from sandbox/test-java-ab-eth-driver/src/test/java/org/apache/plc4x/protocol/abeth/AbEthTest.java
rename to plc4j/drivers/ab-eth/src/test/java/org/apache/plc4x/protocol/abeth/AbEthTest.java
diff --git a/sandbox/test-java-ab-eth-driver/src/test/resources/testsuite/AbEthTestsuite.xml b/plc4j/drivers/ab-eth/src/test/resources/testsuite/AbEthTestsuite.xml
similarity index 100%
rename from sandbox/test-java-ab-eth-driver/src/test/resources/testsuite/AbEthTestsuite.xml
rename to plc4j/drivers/ab-eth/src/test/resources/testsuite/AbEthTestsuite.xml
diff --git a/plc4j/drivers/pom.xml b/plc4j/drivers/pom.xml
index d336579..351ac53 100644
--- a/plc4j/drivers/pom.xml
+++ b/plc4j/drivers/pom.xml
@@ -34,6 +34,7 @@
<description>Wrapper project for all PLC4J driver implementations.</description>
<modules>
+ <module>ab-eth</module>
<module>ads</module>
<module>ethernet-ip</module>
<module>modbus</module>
diff --git a/plc4j/karaf-features/pom.xml b/plc4j/karaf-features/pom.xml
index 9f2f89a..0deed8f 100644
--- a/plc4j/karaf-features/pom.xml
+++ b/plc4j/karaf-features/pom.xml
@@ -111,6 +111,4 @@
</plugins>
</build>
-
-
</project>
\ No newline at end of file
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index 46b627a..721910c 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -39,7 +39,6 @@
<module>plc-simulator</module>
<module>streampipes-connectors</module>
- <module>test-java-ab-eth-driver</module>
<module>test-java-bacnetip-driver</module>
<module>test-java-knxnetip-driver</module>
<module>test-java-s7-driver</module>