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 2021/08/01 19:18:06 UTC
[plc4x] 01/13: Merge branch 'develop' of github.com:apache/plc4x
into feature/profinet-chris
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/profinet-chris
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 9a96de35d11c5029a4773c88d0ba52fc7002db99
Merge: d286844 0d6c7b0
Author: cdutz <ch...@c-ware.de>
AuthorDate: Sun Aug 1 12:04:30 2021 +0200
Merge branch 'develop' of github.com:apache/plc4x into feature/profinet-chris
.../BaseFreemarkerLanguageTemplateHelper.java | 24 +-
.../freemarker/FreemarkerLanguageOutput.java | 11 +-
.../apache/plc4x/language/c/CLanguageOutput.java | 9 +-
.../apache/plc4x/language/go/GoLanguageOutput.java | 8 +-
.../plc4x/language/java/JavaLanguageOutput.java | 10 +-
.../language/java/JavaLanguageTemplateHelper.java | 14 +-
.../resources/templates/java/io-template.java.ftlh | 48 +-
.../templates/java/pojo-template.java.ftlh | 2 +
.../definitions/DefaultComplexTypeDefinition.java | 5 +
.../src/main/resources/protocols/test/test.mspec | 44 +-
plc4j/drivers/opcua/pom.xml | 82 +-
.../apache/plc4x/java/opcua/OpcuaPlcDriver.java | 233 +++-
.../java/opcua/config/OpcuaConfiguration.java | 229 ++++
.../opcua/connection/BaseOpcuaPlcConnection.java | 103 --
.../opcua/connection/OpcuaConnectionFactory.java | 38 -
.../opcua/connection/OpcuaTcpPlcConnection.java | 919 ---------------
.../java/opcua/context/CertificateGenerator.java | 126 ++
.../java/opcua/context/CertificateKeyPair.java | 44 +
.../java/opcua/context/EncryptionHandler.java | 250 ++++
.../plc4x/java/opcua/context/SecureChannel.java | 1202 ++++++++++++++++++++
.../context/SecureChannelTransactionManager.java | 116 ++
.../java/opcua/{protocol => field}/OpcuaField.java | 13 +-
.../{protocol => field}/OpcuaPlcFieldHandler.java | 5 +-
.../plc4x/java/opcua/optimizer/OpcuaOptimizer.java | 58 +
.../java/opcua/protocol/OpcuaProtocolLogic.java | 905 +++++++++++++++
.../opcua/protocol/OpcuaSubscriptionHandle.java | 489 ++++++++
.../opcua/protocol/OpcuaSubsriptionHandle.java | 92 --
.../apache/plc4x/java/opcua/ManualPLC4XOpcua.java | 135 ++-
.../plc4x/java/opcua/OpcuaPlcDriverTest.java | 48 +-
.../connection/OpcuaTcpPlcConnectionTest.java | 40 +-
.../plc4x/java/opcua/protocol/OpcuaFieldTest.java | 2 +-
.../protocol/OpcuaSubscriptionHandleTest.java | 511 ++++++++-
.../opcua/src/test/resources/log4j.properties | 24 +
plc4j/drivers/opcua/src/test/resources/logback.xml | 31 +
.../plc4x/java/examples/helloplc4x/HelloPlc4x.java | 1 +
.../apache/plc4x/java/opcuaserver/UtilsTest.java | 40 -
.../apache/plc4x/java/spi/ConversationContext.java | 3 +
.../apache/plc4x/java/spi/Plc4xNettyWrapper.java | 20 +-
.../apache/plc4x/java/spi/Plc4xProtocolBase.java | 4 +
.../spi/connection/DefaultNettyPlcConnection.java | 38 +-
.../java/spi/connection/GeneratedDriverBase.java | 13 +-
.../plc4x/java/spi/events/DiscoverEvent.java | 22 +
.../plc4x/java/spi/events/DiscoveredEvent.java | 32 +
.../java/spi/generation/WriteBufferByteBased.java | 4 +
.../test/driver/internal/DriverTestsuite.java | 28 +-
.../internal/DriverTestsuiteConfiguration.java | 14 +-
.../handlers/IncomingPlcMessageHandler.java | 2 +-
.../handlers/OutgoingPlcMessageHandler.java | 2 +-
.../plc4x/test/migration/MessageResolver.java | 92 +-
.../migration/MessageValidatorAndMigrator.java | 25 +-
.../ParserSerializerTestsuiteRunner.java | 20 +-
.../model/ParserSerializerTestsuite.java | 9 +-
.../test/parserserializer/model/Testcase.java | 1 +
.../java/org/apache/plc4x/test/xml/XmlHelper.java | 53 +
.../main/resources/schemas/driver-testsuite.xsd | 39 +-
.../schemas/parser-serializer-testsuite.xsd | 22 +
protocols/opcua/pom.xml | 204 ++++
.../apache/plc4x/protocol/opcua/OpcuaProtocol.java | 35 +-
protocols/opcua/src/main/xslt/opc-common.xsl | 500 ++++++++
protocols/opcua/src/main/xslt/opc-manual.xsl | 436 +++++++
protocols/opcua/src/main/xslt/opc-services.xsl | 62 +
protocols/opcua/src/main/xslt/opc-status.xsl | 58 +
protocols/opcua/src/main/xslt/opc-types.xsl | 58 +
src/site/asciidoc/users/protocols/index.adoc | 139 ++-
src/site/asciidoc/users/protocols/opc-ua.adoc | 12 +-
65 files changed, 6313 insertions(+), 1545 deletions(-)