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/06/24 15:52:32 UTC
[plc4x-build-tools] 03/03: - Removed tests and documentation
skeleton as both were completely useless after moving out some of the
stuff.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x-build-tools.git
commit 5042c2ca0c9986d3cf6686596da7d233868d97fd
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Jun 19 12:17:57 2019 +0200
- Removed tests and documentation skeleton as both were completely useless after moving out some of the stuff.
---
plc4x-maven-plugin/src/it/settings.xml | 53 -----
plc4x-maven-plugin/src/it/simple-it/pom.xml | 67 -------
.../src/main/resources/test/protocol.dfdl.xsd | 114 -----------
plc4x-maven-plugin/src/it/simple-it/verify.groovy | 21 --
plc4x-maven-plugin/src/site/asciidoc/index.adoc | 20 --
.../src/site/asciidoc/message-format-language.adoc | 21 --
.../plugins/codegenerator/GenerateMojoTest.java | 87 --------
.../test/projects/simple-embedded-schema/pom.xml | 48 -----
.../src/main/resources/protocol.spec | 222 ---------------------
.../src/main/resources/template.ftlh | 59 ------
.../src/test/resources/specs/s7.spec | 219 --------------------
11 files changed, 931 deletions(-)
diff --git a/plc4x-maven-plugin/src/it/settings.xml b/plc4x-maven-plugin/src/it/settings.xml
deleted file mode 100644
index 1eaaf27..0000000
--- a/plc4x-maven-plugin/src/it/settings.xml
+++ /dev/null
@@ -1,53 +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.
- -->
-<settings>
- <profiles>
- <profile>
- <id>it-repo</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>local.central</id>
- <url>@localRepositoryUrl@</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>local.central</id>
- <url>@localRepositoryUrl@</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- </profiles>
-</settings>
diff --git a/plc4x-maven-plugin/src/it/simple-it/pom.xml b/plc4x-maven-plugin/src/it/simple-it/pom.xml
deleted file mode 100644
index e43d806..0000000
--- a/plc4x-maven-plugin/src/it/simple-it/pom.xml
+++ /dev/null
@@ -1,67 +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>
-
- <groupId>org.apache.plc4x.plugins.it</groupId>
- <artifactId>simple-it</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <description>A simple IT verifying the basic use case.</description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
- <version>@project.version@</version>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate-driver</goal>
- </goals>
- <configuration>
- <dfdl-schema>test/protocol.dfdl.xsd</dfdl-schema>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/plc4x-maven-plugin/src/it/simple-it/src/main/resources/test/protocol.dfdl.xsd b/plc4x-maven-plugin/src/it/simple-it/src/main/resources/test/protocol.dfdl.xsd
deleted file mode 100644
index 5e322f5..0000000
--- a/plc4x-maven-plugin/src/it/simple-it/src/main/resources/test/protocol.dfdl.xsd
+++ /dev/null
@@ -1,114 +0,0 @@
-<!--
- 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.
- -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
- xmlns:knx="http://plc4x.apache.org/knxnet-ip"
- targetNamespace="http://plc4x.apache.org/knxnet-ip">
-
- <xs:annotation>
- <xs:appinfo source="http://www.ogf.org/dfdl/">
- <dfdl:defineVariable name="messageType" type="xs:string"/>
- <dfdl:defineFormat name="knxNetIpFullFormat">
- <dfdl:format representation="binary"
- binaryNumberRep="binary"
- byteOrder="bigEndian"
- lengthKind="implicit" lengthUnits="bytes" length="0"
- occursCountKind="implicit"
- textOutputMinLength="0"
- alignment="1" alignmentUnits="bits"
- leadingSkip="0" trailingSkip="0"
- textPadKind="none" ignoreCase="no"
- textBidi="no" floating="no"
- encoding="utf-8" truncateSpecifiedLengthString="no"
- initiator="" terminator=""
- sequenceKind="ordered" separator=""
- escapeSchemeRef="" initiatedContent="no"
- encodingErrorPolicy="replace"/>
- </dfdl:defineFormat>
- <dfdl:format ref="knx:knxNetIpFullFormat"/>
- </xs:appinfo>
- </xs:annotation>
-
- <!--
-
- Simple type definition.
-
- -->
-
- <xs:simpleType name="bit" dfdl:lengthUnits="bits" dfdl:length="1" dfdl:lengthKind="explicit">
- <xs:restriction base="xs:boolean"/>
- </xs:simpleType>
-
- <xs:simpleType name="byte" dfdl:lengthUnits="bytes" dfdl:length="1" dfdl:lengthKind="explicit">
- <xs:restriction base="xs:unsignedByte"/>
- </xs:simpleType>
-
- <xs:simpleType name="short" dfdl:lengthUnits="bytes" dfdl:length="2" dfdl:lengthKind="explicit">
- <xs:restriction base="xs:unsignedShort"/>
- </xs:simpleType>
-
- <xs:simpleType name="hexByte" dfdl:lengthUnits="bytes" dfdl:length="1" dfdl:lengthKind="explicit">
- <xs:restriction base="xs:hexBinary"/>
- </xs:simpleType>
-
- <!--
-
- TPKT - Iso-On-TCP
-
- -->
-
- <xs:element name="KNXNetIPMessage" type="knx:KNXNetIPMessageType"/>
-
- <xs:complexType name="KNXNetIPMessageType">
- <xs:sequence>
- <xs:element name="header">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="headerLength" type="knx:byte" fixed="06"/>
- <xs:element name="protocolVersion" type="knx:byte" fixed="10"/>
- <xs:element name="serviceTypeIdentifier" type="knx:short"/>
- <!-- length of the entire message (including header) -->
- <xs:element name="totalLength" type="knx:short"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="body">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="cEMIFrame" type="knx:cEMIFrameType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- http://www.eb-systeme.de/?page_id=479
- <xs:complexType name="cEMIFrameType">
- <xs:sequence>
- <xs:element name="structureLength" type="knx:byte"/>
- <xs:element name="descriptionType" type="knx:byte"/>
- <xs:choice dfdl:choiceDispatchKey="{descriptionType}">
- <xs:element dfdl:choiceBranchKey="" ref="knx:blah"/>
- <xs:element dfdl:choiceBranchKey="" ref="knx:blah"/>
- <xs:element dfdl:choiceBranchKey="" ref="knx:blah"/>
- <xs:element dfdl:choiceBranchKey="" ref="knx:blah"/>
- </xs:choice>
- </xs:sequence>
- </xs:complexType>
-
-</xs:schema>
\ No newline at end of file
diff --git a/plc4x-maven-plugin/src/it/simple-it/verify.groovy b/plc4x-maven-plugin/src/it/simple-it/verify.groovy
deleted file mode 100644
index 86b2598..0000000
--- a/plc4x-maven-plugin/src/it/simple-it/verify.groovy
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-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.
-*/
-File touchFile = new File( basedir, "target/touch.txt" )
-
-assert touchFile.isFile()
diff --git a/plc4x-maven-plugin/src/site/asciidoc/index.adoc b/plc4x-maven-plugin/src/site/asciidoc/index.adoc
deleted file mode 100644
index f5e41cd..0000000
--- a/plc4x-maven-plugin/src/site/asciidoc/index.adoc
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// 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.
-//
-:imagesdir: img/
-:icons: font
-
-== PLC4X Maven Plugin
diff --git a/plc4x-maven-plugin/src/site/asciidoc/message-format-language.adoc b/plc4x-maven-plugin/src/site/asciidoc/message-format-language.adoc
deleted file mode 100644
index 95f7fb7..0000000
--- a/plc4x-maven-plugin/src/site/asciidoc/message-format-language.adoc
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// 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.
-//
-:imagesdir: img/
-:icons: font
-
-== PLC4X Message-Format-Definition-Language
-
diff --git a/plc4x-maven-plugin/src/test/java/org/apache/plc4x/plugins/codegenerator/GenerateMojoTest.java b/plc4x-maven-plugin/src/test/java/org/apache/plc4x/plugins/codegenerator/GenerateMojoTest.java
deleted file mode 100644
index 5846f38..0000000
--- a/plc4x-maven-plugin/src/test/java/org/apache/plc4x/plugins/codegenerator/GenerateMojoTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-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.
-*/
-package org.apache.plc4x.plugins.codegenerator;
-
-import org.apache.maven.plugin.testing.MojoRule;
-import org.apache.maven.plugin.testing.WithoutMojo;
-import org.apache.maven.plugin.testing.resources.TestResources;
-import org.apache.maven.project.MavenProject;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-
-import java.io.File;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-public class GenerateMojoTest {
-
- @Rule
- public MojoRule rule = new MojoRule();
-
- @Rule
- public TestResources testResources = new TestResources();
-
- /**
- * @throws Exception if any
- */
- @Test
- @Ignore
- public void testEmbeddedSchema() throws Exception {
- File baseDir = testResources.getBasedir("simple-embedded-schema");
- MavenProject project = rule.readMavenProject(baseDir);
-
- GenerateMojo generateMojo = (GenerateMojo) rule.lookupConfiguredMojo(project, "generate-driver");
- assertNotNull(generateMojo);
- generateMojo.execute();
-
- File outputDirectory = (File) rule.getVariableValueFromObject(generateMojo, "outputDir");
- assertNotNull(outputDirectory);
- assertTrue(outputDirectory.exists());
- }
-
- /**
- * @throws Exception if any
- */
- @Test
- public void testExternalSchema() throws Exception {
- File baseDir = testResources.getBasedir("s7-external-schema");
- MavenProject project = rule.readMavenProject(baseDir);
-
-/* GenerateMojo generateMojo = (GenerateMojo) rule.lookupConfiguredMojo(project, "generate-driver");
- assertNotNull(generateMojo);
- generateMojo.execute();
-
- File outputDirectory = (File) rule.getVariableValueFromObject(generateMojo, "outputDir");
- assertNotNull(outputDirectory);
- assertTrue(outputDirectory.exists());*/
- }
-
- /**
- * Do not need the MojoRule.
- */
- @WithoutMojo
- @Test
- public void testSomethingWhichDoesNotNeedTheMojoAndProbablyShouldBeExtractedIntoANewClassOfItsOwn() {
- assertTrue(true);
- }
-
-}
-
diff --git a/plc4x-maven-plugin/src/test/projects/simple-embedded-schema/pom.xml b/plc4x-maven-plugin/src/test/projects/simple-embedded-schema/pom.xml
deleted file mode 100644
index c8a28ea..0000000
--- a/plc4x-maven-plugin/src/test/projects/simple-embedded-schema/pom.xml
+++ /dev/null
@@ -1,48 +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>
-
- <groupId>org.apache.plc4x.plugins.ut</groupId>
- <artifactId>test-plc4x-maven-plugin-embedded-schema</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
- <name>Test GenerateMojo with embedded DFDL schema</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.plc4x.plugins</groupId>
- <artifactId>plc4x-maven-plugin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <configuration>
- <messageFormatSchema>${pom.basedir}/src/main/resources/protocol.spec</messageFormatSchema>
- <packageName>org.apache.plc4x.test</packageName>
- <templates>
- <tempate>${pom.basedir}/src/main/resources/template.ftlh</tempate>
- </templates>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/plc4x-maven-plugin/src/test/projects/simple-embedded-schema/src/main/resources/protocol.spec b/plc4x-maven-plugin/src/test/projects/simple-embedded-schema/src/main/resources/protocol.spec
deleted file mode 100644
index 5c4aae1..0000000
--- a/plc4x-maven-plugin/src/test/projects/simple-embedded-schema/src/main/resources/protocol.spec
+++ /dev/null
@@ -1,222 +0,0 @@
-//
-// 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.
-//
-
-////////////////////////////////////////////////////////////////
-// IsoOnTcp/TPKT
-////////////////////////////////////////////////////////////////
-
-[type 'TPKTPacket'
- [const uint 8 'protocolId' '0x3']
- [reserved uint 8 '0x0']
- [implicit uint 16 'len' 'payload.size + 4']
- [field COTPPacket 'payload' {payloadLength: 'len - 4'}]
-]
-
-////////////////////////////////////////////////////////////////
-// COTP
-////////////////////////////////////////////////////////////////
-
-[discriminatedType 'COTPPacket' ['payloadLength']
- [implicit uint 8 'headerLength' 'this.size - (payload.size + 1)']
- [discriminator uint 8 'tpduCode']
- [typeSwitch 'tpduCode'
- ['0xF0' Data
- [field bit 'eot']
- [field uint 7 'tpduRef']
- ]
- ['0xE0' ConnectionRequest
- [field uint 16 'destinationReference']
- [field uint 16 'sourceReference']
- [field uint 8 'protocolClass']
- ]
- ['0xD0' ConnectionResponse
- [field uint 16 'destinationReference']
- [field uint 16 'sourceReference']
- [field uint 8 'protocolClass']
- ]
- ['0x80' DisconnectRequest
- [field uint 16 'destinationReference']
- [field uint 16 'sourceReference']
- [field uint 8 'protocolClass']
- ]
- ['0xC0' DisconnectResponse
- [field uint 16 'destinationReference']
- [field uint 16 'sourceReference']
- ]
- ['0x70' TpduError
- [field uint 16 'destinationReference']
- [field uint 8 'rejectCause']
- ]
- ]
- [arrayField COTPParameter 'parameters' length '(headerLength + 1) - cur']
- [field S7Message 'payload' {payloadLength: 'payloadLength - (headerLength + 1)'}]
-]
-
-[discriminatedType 'COTPParameter'
- [discriminator uint 8 'parameterType']
- [typeSwitch 'parameterType'
- ['0xC0' TpduSize
- [field uint 8 'tpduSize']
- ]
- ['0xC1' CallingTsap
- [field uint 16 'tsapId']
- ]
- ['0xC2' CalledTsap
- [field uint 16 'tsapId']
- ]
- ['0xC3' Checksum
- [field uint 8 'checksum']
- ]
- ['0xE0' DisconnectAdditionalInformation
- [arrayField uint 8 'data' count 'rest']
- ]
- ]
-]
-
-////////////////////////////////////////////////////////////////
-// S7
-////////////////////////////////////////////////////////////////
-
-[discriminatedType 'S7Message' ['payloadLength']
- [const uint 8 'protocolId' '0x32']
- [discriminator uint 8 'messageType']
- [reserved uint 16 '0x00']
- [field uint 16 'tpduReference']
- [implicit uint 16 'parameterLength' 'parameter.size']
- [implicit uint 16 'payloadLength' 'payload.size']
- [typeSwitch 'messageType'
- ['0x01' Request
- [context string 'messageType' 'request']
- ]
- ['0x03' Response
- [context string 'messageType' 'response']
- [field uint 8 'errorClass']
- [field uint 8 'errorCode']
- ]
- ['0x07' UserData
- [context string 'messageType' 'userData']
- ]
- ]
- [optionalField S7Parameter 'parameter' 'parameterLength > 0' {messageType: 'messageType'}]
- [optionalField S7Payload 'payload' 'payloadLength > 0' {messageType: 'messageType', parameter: 'parameter'}]
-]
-
-////////////////////////////////////////////////////////////////
-// Parameters
-
-[discriminatedType 'S7Parameter' ['messageType']
- [discriminator uint 8 'parameterType']
- [typeSwitch 'parameterType','messageType'
- ['0xF0' SetupCommunication
- [reserved uint 8 '0x0']
- [field uint 16 'maxAmqCaller']
- [field uint 16 'maxAmqCallee']
- [field uint 16 'pduLength']
- ]
- ['0x04','request' ReadVarRequest
- [implicit uint 8 'numItems' 'items.size']
- [arrayField S7VarRequestParameterItem 'items' count 'numItems']
- ]
- ['0x04','response' ReadVarResponse
- [field uint 8 'numItems']
- ]
- ['0x05','request' WriteVarRequest
- [implicit uint 8 'numItems' 'items.size']
- [arrayField S7VarRequestParameterItem 'items' count 'numItems']
- ]
- ['0x05','response' WriteVarResponse
- [field uint 8 'numItems']
- ]
- ['0x00','userData' UserData
- [implicit uint 8 'numItems' 'items.size']
- [arrayField UserDataItem 'items' count 'numItems']
- ]
- ]
-]
-
-[discriminatedType 'S7VarRequestParameterItem'
- [discriminator uint 8 'parameterItemType']
- [typeSwitch 'parameterItemType'
- ['0x12' Address
- [implicit uint 8 'addressLength' 'address.size']
- [field S7Address 'address']
- ]
- ]
-]
-
-[discriminatedType 'S7Address'
- [discriminator uint 8 'addressType']
- [typeSwitch 'addressType'
- ['0x10' Any
- [field uint 8 'transportSize']
- [field uint 16 'numberOfElements']
- [field uint 8 'dbNumber']
- [field uint 8 'area']
- [reserved uint 5 '0x0']
- [field uint 16 'byteAddress']
- [field uint 3 'bitAddress']
- ]
- ]
-]
-
-// TODO: CPUFunctions still need some love ...
-[discriminatedType 'UserDataItem'
- [discriminator uint 8 'itemType']
- [typeSwitch 'itemType'
- ['0x12' CPUFunctions
- [implicit uint 8 'parameterLength' 'size']
- [field uint 16 'cpuFunctionType']
- [field uint 8 'subFunctionGroup']
- [field uint 8 'sequenceNumber']
- [optionalField uint 8 'dataUnitReferenceNumber' 'parameterLength == 8']
- [optionalField uint 8 'lastDataUnit' 'parameterLength == 8']
- [optionalField uint 8 'errorCode' 'parameterLength == 8']
- ]
- ]
-]
-
-////////////////////////////////////////////////////////////////
-// Payloads
-
-[discriminatedType 'S7Payload' ['messageType', 'parameter']
- [typeSwitch 'parameter.parameterType', 'messageType'
- ['0x04','response' ReadVarResponse
- [arrayField S7VarPayloadDataItem 'items' count 'parameter.numItems']
- ]
- ['0x05','request' WriteVarRequest
- [arrayField S7VarPayloadDataItem 'items' count 'parameter.numItems']
- ]
- ['0x05','response' WriteVarResponse
- [arrayField S7VarPayloadStatusItem 'items' count 'parameter.numItems']
- ]
- ['0x00','userData' UserData
- ]
- ]
-]
-
-[type 'S7VarPayloadDataItem'
- [field uint 8 'returnCode']
- [field uint 8 'transportSize']
- [field uint 16 'dataLength']
- [arrayField uint 8 'data' count 'dataLength']
-]
-
-[type 'S7VarPayloadStatusItem'
- [field uint 8 'returnCode']
-]
\ No newline at end of file
diff --git a/plc4x-maven-plugin/src/test/projects/simple-embedded-schema/src/main/resources/template.ftlh b/plc4x-maven-plugin/src/test/projects/simple-embedded-schema/src/main/resources/template.ftlh
deleted file mode 100644
index 42e782a..0000000
--- a/plc4x-maven-plugin/src/test/projects/simple-embedded-schema/src/main/resources/template.ftlh
+++ /dev/null
@@ -1,59 +0,0 @@
-<#--
- 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.
--->
-${packageName?replace(".", "/")}/${typeName}.java
-/*
- 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.
-*/
-
-package ${packageName};
-
-public class ${typeName} {
-
-<#list type.simpleFields as simpleField>
- private final ${simpleField.type.name} ${simpleField.name};
-</#list>
-
- public ${typeName}(<#list type.simpleFields as simpleField>${simpleField.type.name} ${simpleField.name}<#sep>, </#sep></#list>) {
-<#list type.simpleFields as simpleField>
- this.${simpleField.name} = ${simpleField.name};
-</#list>
- }
-
-<#list type.simpleFields as simpleField>
- public ${simpleField.type.name} get${simpleField.name?cap_first}() {
- return ${simpleField.name};
- }
-
-</#list>
-}
\ No newline at end of file
diff --git a/plc4x-maven-plugin/src/test/resources/specs/s7.spec b/plc4x-maven-plugin/src/test/resources/specs/s7.spec
deleted file mode 100644
index 1f4b52e..0000000
--- a/plc4x-maven-plugin/src/test/resources/specs/s7.spec
+++ /dev/null
@@ -1,219 +0,0 @@
-//
-// 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.
-//
-
-////////////////////////////////////////////////////////////////
-// IsoOnTcp/TPKT
-////////////////////////////////////////////////////////////////
-
-[type 'TPKTPacket'
- [const uint 8 'protocolId' '0x03']
- [reserved uint 8 '0x00']
- [implicit uint 16 'len' 'payload.size + 4']
- [field COTPPacket 'payload']
-]
-
-////////////////////////////////////////////////////////////////
-// COTP
-////////////////////////////////////////////////////////////////
-
-[discriminatedType 'COTPPacket'
- [implicit uint 8 'headerLength' 'this.size - (payload.size + 1)']
- [discriminator uint 8 'tpduCode']
- [typeSwitch 'tpduCode'
- ['0xF0' COTPPacketData
- [field bit 'eot']
- [field uint 7 'tpduRef']
- ]
- ['0xE0' COTPPacketConnectionRequest
- [field uint 16 'destinationReference']
- [field uint 16 'sourceReference']
- [field uint 8 'protocolClass']
- ]
- ['0xD0' COTPPacketConnectionResponse
- [field uint 16 'destinationReference']
- [field uint 16 'sourceReference']
- [field uint 8 'protocolClass']
- ]
- ['0x80' COTPPacketDisconnectRequest
- [field uint 16 'destinationReference']
- [field uint 16 'sourceReference']
- [field uint 8 'protocolClass']
- ]
- ['0xC0' COTPPacketDisconnectResponse
- [field uint 16 'destinationReference']
- [field uint 16 'sourceReference']
- ]
- ['0x70' COTPPacketTpduError
- [field uint 16 'destinationReference']
- [field uint 8 'rejectCause']
- ]
- ]
- [arrayField COTPParameter 'parameters' length '(headerLength + 1) - cur']
- [field S7Message 'payload']
-]
-
-[discriminatedType 'COTPParameter'
- [discriminator uint 8 'parameterType']
- [typeSwitch 'parameterType'
- ['0xC0' COTPParameterTpduSize
- [field uint 8 'tpduSize']
- ]
- ['0xC1' COTPParameterCallingTsap
- [field uint 16 'tsapId']
- ]
- ['0xC2' COTPParameterCalledTsap
- [field uint 16 'tsapId']
- ]
- ['0xC3' COTPParameterChecksum
- [field uint 8 'checksum']
- ]
- ['0xE0' COTPParameterDisconnectAdditionalInformation
- [arrayField uint 8 'data' count 'rest']
- ]
- ]
-]
-
-////////////////////////////////////////////////////////////////
-// S7
-////////////////////////////////////////////////////////////////
-
-[discriminatedType 'S7Message'
- [const uint 8 'protocolId' '0x32']
- [discriminator uint 8 'messageType']
- [reserved uint 16 '0x0000']
- [field uint 16 'tpduReference']
- [implicit uint 16 'parameterLength' 'parameters.size']
- [implicit uint 16 'payloadLength' 'payloads.size']
- [typeSwitch 'messageType'
- ['0x01' S7MessageRequest
- ]
- ['0x03' S7MessageResponse
- [field uint 8 'errorClass']
- [field uint 8 'errorCode']
- ]
- ['0x07' S7MessageUserData
- ]
- ]
- [field S7Parameter 'parameter' ['messageType']]
- [field S7Payload 'payload' ['messageType', 'parameter']]
-]
-
-////////////////////////////////////////////////////////////////
-// Parameters
-
-[discriminatedType 'S7Parameter' [uint 8 'messageType']
- [discriminator uint 8 'parameterType']
- [typeSwitch 'parameterType','messageType'
- ['0xF0' SetupCommunication
- [reserved uint 8 '0x00']
- [field uint 16 'maxAmqCaller']
- [field uint 16 'maxAmqCallee']
- [field uint 16 'pduLength']
- ]
- ['0x04','0x01' S7ParameterReadVarRequest
- [implicit uint 8 'numItems' 'items.size']
- [arrayField S7VarRequestParameterItem 'items' count 'numItems']
- ]
- ['0x04','0x03' S7ParameterReadVarResponse
- [field uint 8 'numItems']
- ]
- ['0x05','0x01' S7ParameterWriteVarRequest
- [implicit uint 8 'numItems' 'items.size']
- [arrayField S7VarRequestParameterItem 'items' count 'numItems']
- ]
- ['0x05','0x03' S7ParameterWriteVarResponse
- [field uint 8 'numItems']
- ]
- ['0x00','0x07' S7ParameterUserData
- [implicit uint 8 'numItems' 'items.size']
- [arrayField UserDataItem 'items' count 'numItems']
- ]
- ]
-]
-
-[discriminatedType 'S7VarRequestParameterItem'
- [discriminator uint 8 'parameterItemType']
- [typeSwitch 'parameterItemType'
- ['0x12' S7VarRequestParameterItemAddress
- [implicit uint 8 'addressLength' 'address.size']
- [field S7Address 'address']
- ]
- ]
-]
-
-[discriminatedType 'S7Address'
- [discriminator uint 8 'addressType']
- [typeSwitch 'addressType'
- ['0x10' S7AddressAny
- [field uint 8 'transportSize']
- [field uint 16 'numberOfElements']
- [field uint 8 'dbNumber']
- [field uint 8 'area']
- [reserved uint 5 '0x00']
- [field uint 16 'byteAddress']
- [field uint 3 'bitAddress']
- ]
- ]
-]
-
-// TODO: CPUFunctions still need some love ...
-[discriminatedType 'UserDataItem'
- [discriminator uint 8 'itemType']
- [typeSwitch 'itemType'
- ['0x12' UserDataItemCPUFunctions
- [implicit uint 8 'parameterLength' 'size']
- [field uint 16 'cpuFunctionType']
- [field uint 8 'subFunctionGroup']
- [field uint 8 'sequenceNumber']
- [optionalField uint 8 'dataUnitReferenceNumber' 'parameterLength == 8']
- [optionalField uint 8 'lastDataUnit' 'parameterLength == 8']
- [optionalField uint 8 'errorCode' 'parameterLength == 8']
- ]
- ]
-]
-
-////////////////////////////////////////////////////////////////
-// Payloads
-
-[discriminatedType 'S7Payload' [uint 8 'messageType', S7Parameter 'parameter']
- [typeSwitch 'parameter.parameterType', 'messageType'
- ['0x04','response' S7PayloadReadVarResponse
- [arrayField S7VarPayloadDataItem 'items' count 'parameter.numItems']
- ]
- ['0x05','request' S7PayloadWriteVarRequest
- [arrayField S7VarPayloadDataItem 'items' count 'parameter.numItems']
- ]
- ['0x05','response' S7PayloadWriteVarResponse
- [arrayField S7VarPayloadStatusItem 'items' count 'parameter.numItems']
- ]
- ['0x00','userData' S7PayloadUserData
- ]
- ]
-]
-
-[type 'S7VarPayloadDataItem'
- [field uint 8 'returnCode']
- [field uint 8 'transportSize']
- [field uint 16 'dataLength']
- [arrayField uint 8 'data' count 'dataLength']
-]
-
-[type 'S7VarPayloadStatusItem'
- [field uint 8 'returnCode']
-]
\ No newline at end of file