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/10/20 13:52:39 UTC
[plc4x] 04/25: [OSGi] Fixing changed package names.
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a commit to branch feature/resolve-split-package-osgi
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 57cda2f99c8b5dba65958009249559c0ceffea4a
Author: Julian Feinauer <j....@pragmaticminds.de>
AuthorDate: Sun Oct 13 12:49:07 2019 +0200
[OSGi] Fixing changed package names.
---
plc4j/drivers/s7/pom.xml | 6 ++++++
.../s7/src/main/java/org/apache/plc4x/java/s7/S7PlcDriver.java | 2 ++
2 files changed, 8 insertions(+)
diff --git a/plc4j/drivers/s7/pom.xml b/plc4j/drivers/s7/pom.xml
index 68b496b..02b393c 100644
--- a/plc4j/drivers/s7/pom.xml
+++ b/plc4j/drivers/s7/pom.xml
@@ -118,6 +118,12 @@
<version>1.12</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ <version>7.0.0</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/S7PlcDriver.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/S7PlcDriver.java
index eec53f2..36efea1 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/S7PlcDriver.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/S7PlcDriver.java
@@ -23,6 +23,7 @@ import org.apache.plc4x.java.api.authentication.PlcAuthentication;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.s7.connection.S7PlcConnection;
import org.apache.plc4x.java.spi.PlcDriver;
+import org.osgi.service.component.annotations.Component;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -36,6 +37,7 @@ import java.util.regex.Pattern;
* - ISO on TCP (https://tools.ietf.org/html/rfc1006)
* - TCP
*/
+@Component
public class S7PlcDriver implements PlcDriver {
private static final Pattern S7_URI_PATTERN = Pattern.compile("^s7://(?<host>.*)/(?<rack>\\d{1,4})/(?<slot>\\d{1,4})(?<params>\\?.*)?");