You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ke...@apache.org on 2017/12/27 21:43:04 UTC
[incubator-plc4x] branch PLC4X-12 updated (b85290a -> 50e29cb)
This is an automated email from the ASF dual-hosted git repository.
keinmark pushed a change to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from b85290a - Re-synced the branch with the latest changes in master - Still the PlcMessageConversions.scala needs adjusting to the new request/response types
new 4a37be5 Merge branch 'master' into PLC4X-12
new 064ebae WIP PLC4X-12: fix POM dependencies
new 306e821 Merge branch 'PLC4X-12' of https://gitbox.apache.org/repos/asf/incubator-plc4x into PLC4X-12
new 1d0d7cb WIP PLC4X-12: apply current changes to scala api
new 50e29cb WIP PLC4X-12: apply current changes to scala core
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../api/connection/PlcMessageConversions.scala | 45 ++++++++++++++++++----
.../plc4x/scala/api/connection/PlcReader.scala | 4 +-
.../plc4x/scala/api/messages/PlcMessage.scala | 27 +++++++++----
.../plc4x/scala/api/messages/items/PlcItems.scala | 19 +++++++++
.../apache/plc4x/scala/core/PlcDriverManager.scala | 8 ++--
5 files changed, 81 insertions(+), 22 deletions(-)
create mode 100644 plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/items/PlcItems.scala
--
To stop receiving notification emails like this one, please contact
['"commits@plc4x.apache.org" <co...@plc4x.apache.org>'].
[incubator-plc4x] 04/05: WIP PLC4X-12: apply current changes to
scala api
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
keinmark pushed a commit to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 1d0d7cbcf412a4719b1e0abddb84315138479072
Author: Mark Keinhörster <ma...@codecentric.de>
AuthorDate: Wed Dec 27 22:37:55 2017 +0100
WIP PLC4X-12: apply current changes to scala api
---
.../api/connection/PlcMessageConversions.scala | 45 ++++++++++++++++++----
.../plc4x/scala/api/connection/PlcReader.scala | 4 +-
.../plc4x/scala/api/messages/PlcMessage.scala | 27 +++++++++----
.../plc4x/scala/api/messages/items/PlcItems.scala | 19 +++++++++
4 files changed, 78 insertions(+), 17 deletions(-)
diff --git a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcMessageConversions.scala b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcMessageConversions.scala
index 7ec2a2f..aff0121 100644
--- a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcMessageConversions.scala
+++ b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcMessageConversions.scala
@@ -18,19 +18,50 @@ under the License.
*/
package org.apache.plc4x.scala.api.connection
-import org.apache.plc4x.java.messages.{PlcSimpleReadRequest, PlcSimpleReadResponse}
-import org.apache.plc4x.java.types.Value
-import org.apache.plc4x.scala.api.messages.{SimpleReadRequest, SimpleReadResponse}
+import scala.collection.JavaConverters._
+import org.apache.plc4x.java.api.messages.{PlcReadRequest => jPlcReadRequest, PlcReadResponse => jPlcReadResponse}
+import org.apache.plc4x.java.api.messages.items.{ReadRequestItem => jReadRequestItem, ReadResponseItem => jReadResponseItem}
+import org.apache.plc4x.java.api.types.ResponseCode
+import org.apache.plc4x.scala.api.messages.items.{ReadRequestItem, ReadResponseItem}
+import org.apache.plc4x.scala.api.messages.{PlcReadRequest, PlcReadResponse}
private[connection] object PlcMessageConversions {
- implicit class SimpleRequestOps[T](req: SimpleReadRequest[T]) {
+ implicit class requestItemOps(item: ReadRequestItem){
- def toJava: PlcSimpleReadRequest[Value[T]] = new PlcSimpleReadRequest[Value[T]](classOf[Value[T]], req.address, req.size)
+ def toJava: jReadRequestItem = new jReadRequestItem(item.datatype, item.address, item.size)
}
- implicit class PlcSimpleReadResponseOps[T](resp: PlcSimpleReadResponse[Value[T]]) {
+ implicit class jRequestItemOps(item: jReadRequestItem){
- def toScala: SimpleReadResponse[T] = SimpleReadResponse(resp.getAddress, resp.getValue.getValue, resp.getSize)
+ def toScala: ReadRequestItem = new ReadRequestItem(item.getDatatype(), item.getAddress(), item.getSize())
+ }
+
+ implicit class RequestOps(req: PlcReadRequest) {
+
+ def toJava: jPlcReadRequest = new jPlcReadRequest(req.readRequestItems.map(e => e.toJava).asJava)
+ }
+
+ implicit class jRequestOps(req: jPlcReadRequest) {
+
+ def toScala: PlcReadRequest = PlcReadRequest(req.getReadRequestItems().asScala.map(e => e.toScala).toList)
+ }
+
+ implicit class jResponseItemOps(item: jReadResponseItem){
+
+ def toScala: ReadResponseItem =
+ ReadResponseItem(item.getRequestItem().toScala, item.getResponseCode(), item.getValues().asScala.toList)
+ }
+
+ implicit class responseItemOps(item: ReadResponseItem){
+
+ def toJava: jReadResponseItem =
+ new jReadResponseItem(item.readRequestItem.toJava, item.responseCode, item.values.asJava)
+ }
+
+ implicit class ResponseOps(resp: jPlcReadResponse) {
+
+ def toScala: PlcReadResponse =
+ PlcReadResponse(resp.getRequest().toScala, resp.getResponseItems().asScala.map(e => e.toScala).toList)
}
}
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 1bb3111..4129098 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
@@ -20,7 +20,7 @@ package org.apache.plc4x.scala.api.connection
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}
+import org.apache.plc4x.scala.api.messages.{PlcReadRequest, PlcReadResponse}
import scala.compat.java8.FutureConverters._
import scala.concurrent.{ExecutionContext, Future}
@@ -39,7 +39,7 @@ trait PlcReader {
* @tparam T The value type that should be used.
* @return a [[Future]] giving async access to the returned value.
*/
- def read[T](readRequest: SimpleReadRequest[T])(implicit ec: ExecutionContext): Future[SimpleReadResponse[T]] =
+ def read[T](readRequest: PlcReadRequest)(implicit ec: ExecutionContext): Future[PlcReadResponse] =
reader.read(readRequest.toJava).toScala.map { _.toScala }
}
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 b0af69d..a27c9ea 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
@@ -19,18 +19,29 @@ under the License.
package org.apache.plc4x.scala.api.messages
import org.apache.plc4x.java.api.model.Address
+import items.{ReadRequestItem, ReadResponseItem}
+
+import scala.collection.immutable.List
sealed trait PlcMessage
-sealed trait PlcRequest extends PlcMessage {
- def address: Address
+sealed trait PlcRequest extends PlcMessage
+
+final case class PlcReadRequest(readRequestItems: List[ReadRequestItem]){
+ def addItem(item: ReadRequestItem) = PlcReadRequest(item::readRequestItems)
+ def getNumItems = readRequestItems.size
+}
+object PlcReadRequest{
+ def apply(): PlcReadRequest =
+ PlcReadRequest(List[ReadRequestItem]())
+ def apply(readRequestItems: List[ReadRequestItem]): PlcReadRequest =
+ PlcReadRequest(readRequestItems)
+ def apply(datatype: Class[_], address: Address, size: Int = 1): PlcReadRequest =
+ PlcReadRequest(List(ReadRequestItem(datatype, address, size)))
}
-final case class SimpleReadRequest[T](address: Address, size: Int = 1)
+sealed trait PlcResponse extends PlcMessage
+
+final case class PlcReadResponse(readRequest: PlcReadRequest, responseItems: List[ReadResponseItem])
-sealed trait PlcResponse[T] extends PlcMessage {
- def address: Address
- def value: T
-}
-final case class SimpleReadResponse[T](address: Address, value: T, size: Int)
diff --git a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/items/PlcItems.scala b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/items/PlcItems.scala
new file mode 100644
index 0000000..61ac21a
--- /dev/null
+++ b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/items/PlcItems.scala
@@ -0,0 +1,19 @@
+package org.apache.plc4x.scala.api.messages.items
+
+import org.apache.plc4x.java.api.model.Address
+import org.apache.plc4x.java.api.types.ResponseCode
+import scala.collection.immutable.List
+
+case class ReadRequestItem(datatype: Class[_], address: Address, size: Int)
+object ReadRequestItem{
+ def apply(datatype: Class[_], address: Address, size: Int): ReadRequestItem =
+ new ReadRequestItem(datatype, address, size)
+ def apply(datatype: Class[_], address: Address): ReadRequestItem =
+ new ReadRequestItem(datatype, address, size = 1)
+}
+
+case class ReadResponseItem(readRequestItem: ReadRequestItem, responseCode: ResponseCode, values: List[AnyRef])
+object ReadResponseItem{
+ def apply(readRequestItem: ReadRequestItem, responseCode: ResponseCode, values: List[AnyRef]): ReadResponseItem =
+ new ReadResponseItem(readRequestItem, responseCode, values)
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 05/05: WIP PLC4X-12: apply current changes to
scala core
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
keinmark pushed a commit to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 50e29cb1901adcdf0aef875b2f316f140cffa0d2
Author: Mark Keinhörster <ma...@codecentric.de>
AuthorDate: Wed Dec 27 22:41:16 2017 +0100
WIP PLC4X-12: apply current changes to scala core
---
.../main/scala/org/apache/plc4x/scala/core/PlcDriverManager.scala | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/PlcDriverManager.scala b/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/PlcDriverManager.scala
index 093033f..9a63a24 100644
--- a/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/PlcDriverManager.scala
+++ b/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/PlcDriverManager.scala
@@ -19,11 +19,9 @@ under the License.
package org.apache.plc4x.scala.core
import org.apache.plc4x.java.{PlcDriverManager => JPlcDriverManager}
-import org.apache.plc4x.scala.api.PlcDriver
import org.apache.plc4x.scala.api.PlcConnectionError
import scala.util.{Failure, Success, Try}
-import scala.util.control.Exception._
class PlcDriverManager private(val jPlcDriverManager: JPlcDriverManager){
@@ -31,9 +29,9 @@ class PlcDriverManager private(val jPlcDriverManager: JPlcDriverManager){
def this() = this(Thread.currentThread.getContextClassLoader)
- def getDriver(url: String): Either[PlcConnectionError, PlcDriver] = {
- Try(jPlcDriverManager.getDriver(url)) match {
- case Success(jDriver) => Right(new JPlcDriverWrapper(jDriver))
+ def getConnection(url: String): Either[PlcConnectionError, JPlcConnectionWrapper] = {
+ Try(jPlcDriverManager.getConnection(url)) match {
+ case Success(jConnection) => Right(new JPlcConnectionWrapper(jConnection))
case Failure(ex) => Left(PlcConnectionError(ex.getMessage))
}
}
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 03/05: Merge branch 'PLC4X-12' of
https://gitbox.apache.org/repos/asf/incubator-plc4x into PLC4X-12
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
keinmark pushed a commit to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 306e821902867861277dbbce93c6cc66e6629449
Merge: 064ebae b85290a
Author: Mark Keinhörster <ma...@codecentric.de>
AuthorDate: Wed Dec 27 21:18:14 2017 +0100
Merge branch 'PLC4X-12' of https://gitbox.apache.org/repos/asf/incubator-plc4x into PLC4X-12
.../org/apache/plc4x/scala/api/PlcDriver.scala | 2 +-
.../plc4x/scala/api/connection/PlcConnection.scala | 2 +-
.../plc4x/scala/api/connection/PlcReader.scala | 2 +-
.../plc4x/scala/api/messages/PlcMessage.scala | 2 +-
.../plc4x/scala/core/JPlcConnectionWrapper.scala | 2 +-
.../plc4x/scala/core/JPlcDriverWrapper.scala | 4 +-
src/site/asciidoc/development/website.adoc | 177 +++++++++++++++++++++
src/site/asciidoc/infra/website.adoc | 43 -----
src/site/site.xml | 10 +-
9 files changed, 189 insertions(+), 55 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.
[incubator-plc4x] 02/05: WIP PLC4X-12: fix POM dependencies
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
keinmark pushed a commit to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 064ebae6cbe6a988b4330c84ea900025c2a76981
Author: Mark Keinhörster <ma...@codecentric.de>
AuthorDate: Fri Dec 22 12:17:12 2017 +0100
WIP PLC4X-12: fix POM dependencies
---
plc4s/api/pom.xml | 6 +++---
plc4s/core/pom.xml | 8 ++++----
plc4s/pom.xml | 4 ++--
3 files changed, 9 insertions(+), 9 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/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/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>.
[incubator-plc4x] 01/05: Merge branch 'master' into PLC4X-12
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
keinmark pushed a commit to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 4a37be52427e449bb76c298e8ebbb61cc5f2ff60
Merge: b6b345f a9e9ac4
Author: Mark Keinhörster <ma...@codecentric.de>
AuthorDate: Fri Dec 22 12:03:45 2017 +0100
Merge branch 'master' into PLC4X-12
.gitignore | 4 +
LICENSE | 202 ++++++++
.../protocols/s7 => applications/iotree}/pom.xml | 37 +-
.../plc4x/java/applications/iotree/IoTree.java | 105 ++++
.../iotree/src/main/resources/logback.xml | 40 +-
.../{es-edgent-logger => plclogger}/pom.xml | 37 +-
.../java/applications/plclogger/PlcLogger.java | 99 ++++
.../plclogger/src/main/resources/logback.xml | 40 +-
applications/pom.xml | 62 ++-
integrations/apache-brooklyn/pom.xml | 2 +-
integrations/apache-camel/pom.xml | 129 ++++-
.../apache-camel/src/main/docs/PLC4X.adoc | 6 +-
.../java/org/apache/plc4x/camel/Constants.java | 10 +-
.../org/apache/plc4x/camel/PLC4XComponent.java | 22 +-
.../java/org/apache/plc4x/camel/PLC4XEndpoint.java | 62 +++
.../java/org/apache/plc4x/camel/PLC4XProducer.java | 110 +++++
.../services/org/apache/camel/component/plc4x | 2 +-
.../java/org/apache/plc4x/camel}/MockDriver.java | 21 +-
.../org/apache/plc4x/camel/PLC4XComponentTest.java | 54 ++
.../services/org.apache.plc4x.java.api.PlcDriver | 2 +-
.../src/test/resources/log4j2.properties | 7 +-
integrations/apache-edgent/pom.xml | 44 +-
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 200 ++++++++
.../java/org/apache/plc4x/edgent/PlcFunctions.java | 188 +++++++
.../java/org/apache/plc4x/edgent/package-info.java | 10 +-
.../plc4x/edgent/PlcConnectionAdapterTest.java | 544 +++++++++++++++++++++
.../org/apache/plc4x/edgent/PlcFunctionsTest.java | 155 ++++++
.../org/apache/plc4x/edgent/mock/MockAddress.java | 50 +-
.../apache/plc4x/edgent/mock/MockConnection.java | 147 ++++++
.../org/apache/plc4x/edgent}/mock/MockDriver.java | 14 +-
.../services/org.apache.plc4x.java.api.PlcDriver | 2 +-
integrations/apache-mynewt/pom.xml | 2 +-
integrations/pom.xml | 2 +-
plc4c/pom.xml | 2 +-
plc4j/api/pom.xml | 2 +-
.../org/apache/plc4x/java/{ => api}/PlcDriver.java | 8 +-
.../authentication/PlcAuthentication.java | 2 +-
.../PlcUsernamePasswordAuthentication.java | 2 +-
.../api/connection/AbstractPlcConnection.java} | 37 +-
.../java/{ => api}/connection/PlcConnection.java | 29 +-
.../plc4x/java/{ => api}/connection/PlcLister.java | 2 +-
.../plc4x/java/{ => api}/connection/PlcReader.java | 10 +-
.../plc4x/java/{ => api}/connection/PlcWriter.java | 10 +-
.../exceptions/PlcConnectionException.java | 2 +-
.../java/{ => api}/exceptions/PlcException.java | 2 +-
.../java/{ => api}/exceptions/PlcIoException.java | 2 +-
.../{ => api}/exceptions/PlcProtocolException.java | 2 +-
.../plc4x/java/{ => api}/messages/PlcMessage.java | 2 +-
.../plc4x/java/api/messages/PlcReadRequest.java | 62 +++
.../plc4x/java/api/messages/PlcReadResponse.java} | 23 +-
.../plc4x/java/{ => api}/messages/PlcRequest.java | 2 +-
.../java/api/messages}/PlcRequestContainer.java | 5 +-
.../plc4x/java/{ => api}/messages/PlcResponse.java | 2 +-
.../plc4x/java/api/messages/PlcWriteRequest.java | 61 +++
.../plc4x/java/api/messages/PlcWriteResponse.java} | 23 +-
.../messages/items/ReadRequestItem.java} | 26 +-
.../java/api/messages/items/ReadResponseItem.java} | 33 +-
.../messages/items/WriteRequestItem.java} | 32 +-
.../api/messages/items/WriteResponseItem.java} | 23 +-
.../java/{messages => api/model}/Address.java | 2 +-
.../types/ResponseCode.java} | 11 +-
.../plc4x/java/messages/PlcSimpleReadRequest.java | 39 --
.../plc4x/java/messages/PlcSimpleReadResponse.java | 45 --
.../plc4x/java/messages/PlcSimpleWriteRequest.java | 46 --
.../java/messages/PlcSimpleWriteResponse.java | 38 --
.../org/apache/plc4x/java/types/BooleanValue.java | 23 -
.../org/apache/plc4x/java/types/ByteValue.java | 23 -
.../org/apache/plc4x/java/types/IntegerValue.java | 23 -
.../org/apache/plc4x/java/types/StringValue.java | 23 -
plc4j/api/src/site/asciidoc/design.adoc | 51 ++
plc4j/core/pom.xml | 4 +-
.../org/apache/plc4x/java/PlcDriverManager.java | 39 +-
.../apache/plc4x/java/PlcDriverManagerTest.java | 6 +-
.../apache/plc4x/java/mock/DoubleMockDriver.java | 8 +-
.../org/apache/plc4x/java/mock/MockConnection.java | 18 +-
.../org/apache/plc4x/java/mock/MockDriver.java | 8 +-
...cDriver => org.apache.plc4x.java.api.PlcDriver} | 0
...cDriver => org.apache.plc4x.java.api.PlcDriver} | 0
plc4j/pom.xml | 17 +-
plc4j/protocols/pom.xml | 2 +-
plc4j/protocols/s7-utils/pom.xml | 2 +-
.../apache/plc4x/java/s7/utils/PcapGenerator.java | 2 +-
plc4j/protocols/s7/pom.xml | 30 +-
.../java/isoontcp/mina/IsoOnTcpFilterAdapter.java | 118 -----
.../java/isoontcp/netty/IsoOnTcpProtocol.java | 98 ++++
.../isoontcp/netty/model/IsoOnTcpMessage.java} | 16 +-
.../plc4x/java/isotp/mina/IsoTPFilterAdapter.java | 377 --------------
.../plc4x/java/isotp/netty/IsoTPProtocol.java | 358 ++++++++++++++
.../isotp/{mina => netty}/model/IsoTPMessage.java | 10 +-
.../model/params/CalledTsapParameter.java | 6 +-
.../model/params/CallingTsapParameter.java | 6 +-
.../model/params/ChecksumParameter.java | 4 +-
.../DisconnectAdditionalInformationParameter.java | 4 +-
.../{mina => netty}/model/params/Parameter.java | 4 +-
.../model/params/TpduSizeParameter.java | 6 +-
.../model/params/TsapParameter.java | 4 +-
.../model/tpdus/ConnectionConfirmTpdu.java | 12 +-
.../model/tpdus/ConnectionRequestTpdu.java | 12 +-
.../model/tpdus/ConnectionTpdu.java | 12 +-
.../{mina => netty}/model/tpdus/DataTpdu.java | 10 +-
.../model/tpdus/DisconnectConfirmTpdu.java | 10 +-
.../model/tpdus/DisconnectRequestTpdu.java | 12 +-
.../model/tpdus/DisconnectTpdu.java | 10 +-
.../{mina => netty}/model/tpdus/ErrorTpdu.java | 12 +-
.../isotp/{mina => netty}/model/tpdus/Tpdu.java | 12 +-
.../{mina => netty}/model/types/DeviceGroup.java | 2 +-
.../model/types/DisconnectReason.java | 2 +-
.../{mina => netty}/model/types/ParameterCode.java | 2 +-
.../{mina => netty}/model/types/ProtocolClass.java | 2 +-
.../{mina => netty}/model/types/RejectCause.java | 2 +-
.../{mina => netty}/model/types/TpduCode.java | 2 +-
.../{mina => netty}/model/types/TpduSize.java | 2 +-
.../apache/plc4x/java/{mina => netty}/Message.java | 10 +-
.../events/S7ConnectionEvent.java} | 18 +-
.../java/netty/events/S7ConnectionState.java} | 8 +-
.../java/org/apache/plc4x/java/s7/S7PlcDriver.java | 19 +-
.../plc4x/java/s7/connection/S7PlcConnection.java | 180 ++++---
.../plc4x/java/s7/mina/Plc4XS7FilterAdapter.java | 192 --------
.../apache/plc4x/java/s7/mina/S7FilterAdapter.java | 367 --------------
.../s7/mina/model/payloads/ReadVarPayload.java | 48 --
.../org/apache/plc4x/java/s7/model/S7Address.java | 4 +-
.../apache/plc4x/java/s7/model/S7BitAddress.java | 2 +-
.../plc4x/java/s7/model/S7DataBlockAddress.java | 2 +-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 389 +++++++++++++++
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 408 ++++++++++++++++
.../{mina => netty}/model/messages/S7Message.java | 12 +-
.../model/messages/S7RequestMessage.java | 8 +-
.../model/messages/S7ResponseMessage.java | 8 +-
.../messages/SetupCommunicationRequestMessage.java | 6 +-
.../model/params/CpuServicesParameter.java} | 15 +-
.../{mina => netty}/model/params/S7Parameter.java | 4 +-
.../model/params/SetupCommunicationParameter.java | 4 +-
.../model/params/VarParameter.java} | 24 +-
.../model/params/items/S7AnyVarParameterItem.java} | 14 +-
.../model/params/items/VarParameterItem.java} | 6 +-
.../{mina => netty}/model/payloads/S7Payload.java | 4 +-
.../model/payloads/VarPayload.java} | 28 +-
.../model/payloads/items/VarPayloadItem.java} | 19 +-
.../model/types/DataTransportErrorCode.java | 7 +-
.../model/types/DataTransportSize.java | 2 +-
.../model/types/HeaderErrorClass.java | 2 +-
.../s7/{mina => netty}/model/types/MemoryArea.java | 2 +-
.../{mina => netty}/model/types/MessageType.java | 2 +-
.../model/types/ParameterError.java | 2 +-
.../{mina => netty}/model/types/ParameterType.java | 5 +-
.../model/types/SpecificationType.java | 2 +-
.../{mina => netty}/model/types/TransportSize.java | 2 +-
.../model/types/VariableAddressingMode.java | 2 +-
...cDriver => org.apache.plc4x.java.api.PlcDriver} | 0
plc4j/protocols/s7/src/site/asciidoc/index.adoc | 83 +++-
.../java/isoontcp/netty/IsoOnTcpProtocolTest.java | 161 ++++++
.../plc4x/java/isotp/netty/IsoTPProtocolTest.java} | 20 +-
.../apache/plc4x/java/netty/NettyTestBase.java} | 7 +-
.../org/apache/plc4x/java/s7/S7PlcDriverTest.java | 81 +--
.../apache/plc4x/java/s7/S7PlcReaderSample.java | 99 ++++
.../org/apache/plc4x/java/s7/S7PlcScanner.java | 87 ++++
.../org/apache/plc4x/java/s7/S7PlcTestConsole.java | 79 +++
.../apache/plc4x/java/s7/S7PlcWriterSample.java | 69 +++
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java} | 20 +-
.../plc4x/java/s7/netty/S7ProtocolTest.java} | 20 +-
.../protocols/s7/src/test/resources/logback.xml | 40 +-
plc4j/protocols/utils/pom.xml | 2 +-
plc4j/src/site/asciidoc/index.adoc | 121 +++++
plc4s/pom.xml | 2 +-
pom.xml | 129 ++++-
src/site/asciidoc/incubation-proposal.adoc | 227 +++++++++
src/site/asciidoc/index.adoc | 2 +-
src/site/asciidoc/infra/website.adoc | 43 ++
.../protocols/{opc-ua => ehtercat}/index.adoc | 14 +-
src/site/asciidoc/protocols/features.adoc | 2 +-
src/site/asciidoc/protocols/index.adoc | 9 +-
src/site/asciidoc/protocols/modbus/index.adoc | 4 +-
src/site/asciidoc/protocols/opc-ua/index.adoc | 4 +-
src/site/asciidoc/protocols/s7/index.adoc | 93 ++--
src/site/resources/css/site.css | 3 +-
src/site/site.xml | 18 +-
176 files changed, 5492 insertions(+), 2178 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.