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 2018/01/26 11:54:36 UTC
[incubator-plc4x] branch master updated: - Merged the s7-utils and
s7 module
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/master by this push:
new 94301b3 - Merged the s7-utils and s7 module
94301b3 is described below
commit 94301b3f455fb0b36c197928a9ce89dbbabf6323
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Jan 26 12:54:32 2018 +0100
- Merged the s7-utils and s7 module
---
plc4j/protocols/pom.xml | 3 --
plc4j/protocols/s7-utils/pom.xml | 42 ----------------------
plc4j/protocols/s7/pom.xml | 6 ++++
.../org/apache/plc4x/java/s7}/PcapGenerator.java | 2 +-
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 2 +-
plc4j/protocols/utils/pom.xml | 42 ----------------------
plc4j/utils/pom.xml | 1 +
plc4j/utils/wireshark-utils/pom.xml | 6 +++-
.../org/apache/plc4x/java/utils/PcapngUtils.java | 0
9 files changed, 14 insertions(+), 90 deletions(-)
diff --git a/plc4j/protocols/pom.xml b/plc4j/protocols/pom.xml
index 4131e1d..415d22a 100644
--- a/plc4j/protocols/pom.xml
+++ b/plc4j/protocols/pom.xml
@@ -36,9 +36,6 @@
<modules>
<module>s7</module>
- <module>s7-utils</module>
-
- <module>utils</module>
</modules>
</project>
\ No newline at end of file
diff --git a/plc4j/protocols/s7-utils/pom.xml b/plc4j/protocols/s7-utils/pom.xml
deleted file mode 100644
index a3b4918..0000000
--- a/plc4j/protocols/s7-utils/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocols</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>plc4j-protocol-s7-utils</artifactId>
- <name>PLC4J: Protocol: S7-Utils</name>
- <description>Some utils used for helping to document the format.</description>
-
- <dependencies>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/plc4j/protocols/s7/pom.xml b/plc4j/protocols/s7/pom.xml
index b8642be..1ce4dc4 100644
--- a/plc4j/protocols/s7/pom.xml
+++ b/plc4j/protocols/s7/pom.xml
@@ -66,6 +66,12 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/plc4j/protocols/s7-utils/src/main/java/org/apache/plc4x/java/s7/utils/PcapGenerator.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/PcapGenerator.java
similarity index 99%
rename from plc4j/protocols/s7-utils/src/main/java/org/apache/plc4x/java/s7/utils/PcapGenerator.java
rename to plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/PcapGenerator.java
index f8d811f..30d00d8 100644
--- a/plc4j/protocols/s7-utils/src/main/java/org/apache/plc4x/java/s7/utils/PcapGenerator.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/PcapGenerator.java
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
*/
-package org.apache.plc4x.java.s7.utils;
+package org.apache.plc4x.java.s7;
import org.apache.commons.io.FileExistsException;
import org.apache.commons.io.FileUtils;
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java
index 6a9dc62..8cf388b 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java
@@ -171,7 +171,7 @@ public class Plc4XS7ProtocolTest extends NettyTestBase {
}
private VarPayloadItem varPayloadItemFor(Class type) {
- // TODO: fix example
+ // TODO: Most of these are just some value. We have to check if this is actually correct.
final DataTransportSize size;
final byte[] data;
if (type == Boolean.class) {
diff --git a/plc4j/protocols/utils/pom.xml b/plc4j/protocols/utils/pom.xml
deleted file mode 100644
index 690fd3e..0000000
--- a/plc4j/protocols/utils/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-protocols</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>plc4j-protocol-utils</artifactId>
- <name>PLC4J: Protocol: Utils</name>
- <description>Some little helpers that support development of protocol modules.</description>
-
- <dependencies>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/plc4j/utils/pom.xml b/plc4j/utils/pom.xml
index 52834be..09c7fe0 100644
--- a/plc4j/utils/pom.xml
+++ b/plc4j/utils/pom.xml
@@ -37,6 +37,7 @@
<modules>
<module>raw-sockets</module>
+ <module>wireshark-utils</module>
</modules>
</project>
\ No newline at end of file
diff --git a/plc4j/utils/wireshark-utils/pom.xml b/plc4j/utils/wireshark-utils/pom.xml
index 042c91a..510b2a9 100644
--- a/plc4j/utils/wireshark-utils/pom.xml
+++ b/plc4j/utils/wireshark-utils/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-uitils</artifactId>
+ <artifactId>plc4j-utils</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -35,6 +35,10 @@
<description>A set of helper utilities that allow reading and writing of `pcapng` files so they can be inspected with WireShark.</description>
<dependencies>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/plc4j/protocols/utils/src/main/java/org/apache/plc4x/java/utils/PcapngUtils.java b/plc4j/utils/wireshark-utils/src/main/java/org/apache/plc4x/java/utils/PcapngUtils.java
similarity index 100%
rename from plc4j/protocols/utils/src/main/java/org/apache/plc4x/java/utils/PcapngUtils.java
rename to plc4j/utils/wireshark-utils/src/main/java/org/apache/plc4x/java/utils/PcapngUtils.java
--
To stop receiving notification emails like this one, please contact
cdutz@apache.org.