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 15:37:53 UTC
[plc4x] branch next-gen-core updated: - Enabled and fixed the
integration modules
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
The following commit(s) were added to refs/heads/next-gen-core by this push:
new 726f3a4 - Enabled and fixed the integration modules
726f3a4 is described below
commit 726f3a4e05c858907d8a43bbcc68faddb600ac6a
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Dec 18 16:37:46 2019 +0100
- Enabled and fixed the integration modules
---
plc4j/drivers/ads/pom.xml | 2 +-
plc4j/integrations/apache-calcite/pom.xml | 1 -
plc4j/integrations/apache-camel/pom.xml | 2 +-
plc4j/integrations/apache-edgent/pom.xml | 4 ++--
.../test/java/org/apache/plc4x/edgent/mock/MockConnection.java | 1 +
plc4j/integrations/pom.xml | 10 +++++-----
plc4j/karaf-features/s7/src/main/feature/feature.xml | 2 +-
plc4j/protocols/ads/pom.xml | 2 +-
plc4j/utils/interop/pom.xml | 2 +-
src/site/asciidoc/users/testing.adoc | 2 +-
10 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/plc4j/drivers/ads/pom.xml b/plc4j/drivers/ads/pom.xml
index ab80f9b..e645571 100644
--- a/plc4j/drivers/ads/pom.xml
+++ b/plc4j/drivers/ads/pom.xml
@@ -83,7 +83,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/integrations/apache-calcite/pom.xml b/plc4j/integrations/apache-calcite/pom.xml
index 6b367ae..f521663 100644
--- a/plc4j/integrations/apache-calcite/pom.xml
+++ b/plc4j/integrations/apache-calcite/pom.xml
@@ -93,5 +93,4 @@
</plugins>
</build>
-
</project>
\ No newline at end of file
diff --git a/plc4j/integrations/apache-camel/pom.xml b/plc4j/integrations/apache-camel/pom.xml
index 197c0d9..3d9b81c 100644
--- a/plc4j/integrations/apache-camel/pom.xml
+++ b/plc4j/integrations/apache-camel/pom.xml
@@ -83,7 +83,7 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocol-driver-base</artifactId>
+ <artifactId>plc4j-spi</artifactId>
<version>0.6.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
diff --git a/plc4j/integrations/apache-edgent/pom.xml b/plc4j/integrations/apache-edgent/pom.xml
index 5582aec..240b827 100644
--- a/plc4j/integrations/apache-edgent/pom.xml
+++ b/plc4j/integrations/apache-edgent/pom.xml
@@ -67,13 +67,13 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocol-driver-base</artifactId>
+ <artifactId>plc4j-spi</artifactId>
<version>0.6.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<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/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
index 491e8c7..8e30e77 100644
--- a/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
+++ b/plc4j/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
@@ -28,6 +28,7 @@ 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.api.types.PlcResponseCode;
+import org.apache.plc4x.java.spi.messages.*;
import org.apache.plc4x.java.spi.messages.items.BaseDefaultFieldItem;
import java.util.HashMap;
diff --git a/plc4j/integrations/pom.xml b/plc4j/integrations/pom.xml
index ab9b315..72a11e7 100644
--- a/plc4j/integrations/pom.xml
+++ b/plc4j/integrations/pom.xml
@@ -33,11 +33,11 @@
<description>Parent of all product specific integration modules.</description>
<modules>
-<!-- <module>apache-camel</module>-->
-<!-- <module>apache-edgent</module>-->
-<!-- <module>apache-kafka</module>-->
-<!-- <module>apache-nifi</module>-->
-<!-- <module>apache-calcite</module>-->
+ <module>apache-camel</module>
+ <module>apache-edgent</module>
+ <module>apache-kafka</module>
+ <module>apache-nifi</module>
+ <module>apache-calcite</module>
</modules>
<profiles>
diff --git a/plc4j/karaf-features/s7/src/main/feature/feature.xml b/plc4j/karaf-features/s7/src/main/feature/feature.xml
index b64fe4a..30f865e 100644
--- a/plc4j/karaf-features/s7/src/main/feature/feature.xml
+++ b/plc4j/karaf-features/s7/src/main/feature/feature.xml
@@ -29,7 +29,7 @@
<bundle>mvn:org.apache.plc4x/plc4j-protocol-iso-on-tcp/${project.version}</bundle>
<bundle>mvn:org.apache.plc4x/plc4j-protocol-iso-tp/${project.version}</bundle>
<bundle>mvn:org.apache.plc4x/plc4j-protocol-s7/${project.version}</bundle>
- <bundle>mvn:org.apache.plc4x/plc4j-protocol-driver-base/${project.version}</bundle>
+ <bundle>mvn:org.apache.plc4x/plc4j-spi/${project.version}</bundle>
<bundle>mvn:org.apache.plc4x/plc4j-utils-driver-base-java/${project.version}</bundle>
<bundle>mvn:org.apache.plc4x/plc4j-transport-tcp/${project.version}</bundle>
<bundle>mvn:io.netty/netty-codec/4.1.39.Final</bundle>
diff --git a/plc4j/protocols/ads/pom.xml b/plc4j/protocols/ads/pom.xml
index bcc6f00..06db491 100644
--- a/plc4j/protocols/ads/pom.xml
+++ b/plc4j/protocols/ads/pom.xml
@@ -93,7 +93,7 @@
</dependency>
<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/utils/interop/pom.xml b/plc4j/utils/interop/pom.xml
index 9ae2eec..34cff4e 100644
--- a/plc4j/utils/interop/pom.xml
+++ b/plc4j/utils/interop/pom.xml
@@ -163,7 +163,7 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocol-driver-base-test</artifactId>
+ <artifactId>plc4j-transport-test</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/src/site/asciidoc/users/testing.adoc b/src/site/asciidoc/users/testing.adoc
index 1cb9808..3ca9485 100644
--- a/src/site/asciidoc/users/testing.adoc
+++ b/src/site/asciidoc/users/testing.adoc
@@ -26,7 +26,7 @@ The driver can be found in the Maven module
```
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocol-driver-base-test</artifactId>
+ <artifactId>plc4j-transport-test</artifactId>
<version>${current.version}</version>
<scope>test</scope>
</dependency>