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 2017/12/27 13:33:22 UTC
[incubator-plc4x] 02/02: - Re-synced the branch with the latest
changes in master - Still the PlcMessageConversions.scala needs adjusting
to the new request/response types
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit b85290ab0831c0b70fe8dff1c546cf79b8f59045
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Dec 27 14:33:07 2017 +0100
- Re-synced the branch with the latest changes in master
- Still the PlcMessageConversions.scala needs adjusting to the new request/response types
---
plc4s/api/pom.xml | 6 +++---
.../api/src/main/scala/org/apache/plc4x/scala/api/PlcDriver.scala | 2 +-
.../org/apache/plc4x/scala/api/connection/PlcConnection.scala | 2 +-
.../scala/org/apache/plc4x/scala/api/connection/PlcReader.scala | 2 +-
.../scala/org/apache/plc4x/scala/api/messages/PlcMessage.scala | 2 +-
plc4s/core/pom.xml | 8 ++++----
.../scala/org/apache/plc4x/scala/core/JPlcConnectionWrapper.scala | 2 +-
.../scala/org/apache/plc4x/scala/core/JPlcDriverWrapper.scala | 4 ++--
plc4s/pom.xml | 4 ++--
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/plc4s/api/pom.xml b/plc4s/api/pom.xml
index 3406be9..dcf05e6 100644
--- a/plc4s/api/pom.xml
+++ b/plc4s/api/pom.xml
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4s</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -46,11 +46,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-core</artifactId>
</dependency>
<dependency>
diff --git a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/PlcDriver.scala b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/PlcDriver.scala
index 647ef0f..075d86f 100644
--- a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/PlcDriver.scala
+++ b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/PlcDriver.scala
@@ -18,7 +18,7 @@ under the License.
*/
package org.apache.plc4x.scala.api
-import org.apache.plc4x.java.authentication.PlcAuthentication
+import org.apache.plc4x.java.api.authentication.PlcAuthentication
import org.apache.plc4x.scala.api.connection.PlcConnection
/**
diff --git a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcConnection.scala b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcConnection.scala
index 84213ba..e54294f 100644
--- a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcConnection.scala
+++ b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcConnection.scala
@@ -18,7 +18,7 @@ under the License.
*/
package org.apache.plc4x.scala.api.connection
-import org.apache.plc4x.java.messages.Address
+import org.apache.plc4x.java.api.model.Address
import org.apache.plc4x.scala.api.PlcError
/**
diff --git a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcReader.scala b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcReader.scala
index 4fe8380..1bb3111 100644
--- a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcReader.scala
+++ b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcReader.scala
@@ -18,7 +18,7 @@ under the License.
*/
package org.apache.plc4x.scala.api.connection
-import org.apache.plc4x.java.connection.{PlcReader => JPlcReader}
+import org.apache.plc4x.java.api.connection.{PlcReader => JPlcReader}
import org.apache.plc4x.scala.api.connection.PlcMessageConversions._
import org.apache.plc4x.scala.api.messages.{SimpleReadRequest, SimpleReadResponse}
diff --git a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/PlcMessage.scala b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/PlcMessage.scala
index b08f270..b0af69d 100644
--- a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/PlcMessage.scala
+++ b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/PlcMessage.scala
@@ -18,7 +18,7 @@ under the License.
*/
package org.apache.plc4x.scala.api.messages
-import org.apache.plc4x.java.messages.Address
+import org.apache.plc4x.java.api.model.Address
sealed trait PlcMessage
diff --git a/plc4s/core/pom.xml b/plc4s/core/pom.xml
index 07d6fb1..b61b12a 100644
--- a/plc4s/core/pom.xml
+++ b/plc4s/core/pom.xml
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4s</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -46,15 +46,15 @@
<dependencies>
<dependency>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4s-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
diff --git a/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/JPlcConnectionWrapper.scala b/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/JPlcConnectionWrapper.scala
index 65ac689..89fa847 100644
--- a/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/JPlcConnectionWrapper.scala
+++ b/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/JPlcConnectionWrapper.scala
@@ -18,7 +18,7 @@ under the License.
*/
package org.apache.plc4x.scala.core
-import org.apache.plc4x.java.connection.{PlcConnection => JPlcConnection}
+import org.apache.plc4x.java.api.connection.{PlcConnection => JPlcConnection}
import org.apache.plc4x.scala.api.PlcConnectionError
import org.apache.plc4x.scala.api.connection.PlcConnection
diff --git a/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/JPlcDriverWrapper.scala b/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/JPlcDriverWrapper.scala
index 49859ec..84d2e28 100644
--- a/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/JPlcDriverWrapper.scala
+++ b/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/JPlcDriverWrapper.scala
@@ -18,8 +18,8 @@ under the License.
*/
package org.apache.plc4x.scala.core
-import org.apache.plc4x.java.authentication.PlcAuthentication
-import org.apache.plc4x.java.{PlcDriver => JPlcDriver}
+import org.apache.plc4x.java.api.authentication.PlcAuthentication
+import org.apache.plc4x.java.api.{PlcDriver => JPlcDriver}
import org.apache.plc4x.scala.api.{PlcConnectionError, PlcDriver}
import scala.util.{Failure, Success, Try}
diff --git a/plc4s/pom.xml b/plc4s/pom.xml
index bb1ac82..ab06f44 100644
--- a/plc4s/pom.xml
+++ b/plc4s/pom.xml
@@ -81,12 +81,12 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-core</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.