Skip to content

Commit 72aaff5

Browse files
chrisdutzchrisdutz
committed
chore: Updated the configuration of the new umas protocol to wait to be ported.
1 parent 8bcbeb4 commit 72aaff5

84 files changed

Lines changed: 7054 additions & 9981 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎plc4j/drivers/s7/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@
209209
<dependencies>
210210
<dependency>
211211
<groupId>org.apache.plc4x</groupId>
212-
<artifactId>plc4x-code-generation-language-java-jp</artifactId> <version>0.14.0-SNAPSHOT</version>
212+
<artifactId>plc4x-code-generation-language-java-jp</artifactId>
213+
<version>0.14.0-SNAPSHOT</version>
213214
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
214215
<scope>provided</scope>
215216
</dependency>

‎plc4j/drivers/umas/pom.xml‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
</properties>
3737

3838
<build>
39+
<!-- Override the path of the sources roots until the code is ported -->
40+
<sourceDirectory>src/main/temp</sourceDirectory>
41+
<testSourceDirectory>src/test/temp</testSourceDirectory>
3942
<plugins>
4043
<plugin>
4144
<groupId>org.apache.karaf.tooling</groupId>
@@ -96,24 +99,35 @@
9699
</dependency>
97100
<dependency>
98101
<groupId>org.apache.plc4x</groupId>
99-
<artifactId>plc4j-spi</artifactId>
102+
<artifactId>plc4j-spi-buffers-api</artifactId>
100103
<version>0.14.0-SNAPSHOT</version>
101104
</dependency>
102-
103105
<dependency>
104106
<groupId>org.apache.plc4x</groupId>
105-
<artifactId>plc4j-transport-tcp</artifactId>
107+
<artifactId>plc4j-spi-buffers-byte</artifactId>
106108
<version>0.14.0-SNAPSHOT</version>
107109
</dependency>
108-
109110
<dependency>
110-
<groupId>io.netty</groupId>
111-
<artifactId>netty-buffer</artifactId>
111+
<groupId>org.apache.plc4x</groupId>
112+
<artifactId>plc4j-spi-fields</artifactId>
113+
<version>0.14.0-SNAPSHOT</version>
112114
</dependency>
113115
<dependency>
114-
<groupId>io.netty</groupId>
115-
<artifactId>netty-transport</artifactId>
116+
<groupId>org.apache.plc4x</groupId>
117+
<artifactId>plc4j-spi-utils</artifactId>
118+
<version>0.14.0-SNAPSHOT</version>
116119
</dependency>
120+
<dependency>
121+
<groupId>org.apache.plc4x</groupId>
122+
<artifactId>plc4j-spi-values</artifactId>
123+
<version>0.14.0-SNAPSHOT</version>
124+
</dependency>
125+
126+
<!--dependency>
127+
<groupId>org.apache.plc4x</groupId>
128+
<artifactId>plc4j-transports-tcp</artifactId>
129+
<version>0.14.0-SNAPSHOT</version>
130+
</dependency-->
117131

118132
<dependency>
119133
<groupId>org.slf4j</groupId>
@@ -134,7 +148,6 @@
134148
<dependency>
135149
<groupId>org.skyscreamer</groupId>
136150
<artifactId>jsonassert</artifactId>
137-
<version>1.5.3</version>
138151
<scope>test</scope>
139152
</dependency>
140153

@@ -179,7 +192,7 @@
179192
<dependencies>
180193
<dependency>
181194
<groupId>org.apache.plc4x</groupId>
182-
<artifactId>plc4x-code-generation-language-java</artifactId>
195+
<artifactId>plc4x-code-generation-language-java-jp</artifactId>
183196
<version>0.14.0-SNAPSHOT</version>
184197
<!-- Scope is 'provided' as this way it's not shipped with the driver -->
185198
<scope>provided</scope>

‎plc4j/drivers/umas/src/main/generated/org/apache/plc4x/java/umas/readwrite/Constants.java‎

Lines changed: 23 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,28 @@
1-
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one
3-
* or more contributor license agreements. See the NOTICE file
4-
* distributed with this work for additional information
5-
* regarding copyright ownership. The ASF licenses this file
6-
* to you under the Apache License, Version 2.0 (the
7-
* "License"); you may not use this file except in compliance
8-
* with the License. You may obtain a copy of the License at
9-
*
10-
* https://www.apache.org/licenses/LICENSE-2.0
11-
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
18-
*/
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// https://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1917
package org.apache.plc4x.java.umas.readwrite;
2018

21-
import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
22-
import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
23-
import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
24-
import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
25-
import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
26-
27-
import java.time.*;
28-
import java.util.*;
29-
import org.apache.plc4x.java.api.exceptions.*;
30-
import org.apache.plc4x.java.api.value.*;
31-
import org.apache.plc4x.java.spi.codegen.*;
32-
import org.apache.plc4x.java.spi.codegen.fields.*;
33-
import org.apache.plc4x.java.spi.codegen.io.*;
34-
import org.apache.plc4x.java.spi.generation.*;
35-
36-
// Code generated by code-generation. DO NOT EDIT.
37-
19+
/**
20+
* Code generated by code-generation. DO NOT EDIT.
21+
*/
3822
public class Constants {
39-
40-
// Constant values.
4123
public static final Integer UMASTCPDEFAULTPORT = 502;
24+
25+
public int getUmasTcpDefaultPort() {
26+
return UMASTCPDEFAULTPORT;
27+
}
4228
}

0 commit comments

Comments
 (0)