You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@plc4x.apache.org by na...@apache.org on 2020/01/28 23:08:12 UTC

[plc4x] 01/07: Merge branches 'PLC4X-157OPC-UADisablediscovery' and 'develop' of https://github.com/apache/plc4x into develop

This is an automated email from the ASF dual-hosted git repository.

nalim2 pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit ae46fff55a395637aae04bdb421505438aa730b6
Merge: d3ebc94 77c0b4b
Author: Matthias Milan Strljic <Ma...@googlemail.com>
AuthorDate: Sat Dec 7 17:17:38 2019 +0100

    Merge branches 'PLC4X-157OPC-UADisablediscovery' and 'develop' of https://github.com/apache/plc4x into develop

 plc4j/drivers/opcua/pom.xml                        |   3 +-
 .../apache/plc4x/java/opcua/OpcuaPlcDriver.java    |  10 +-
 .../opcua/connection/BaseOpcuaPlcConnection.java   |  15 +-
 .../opcua/connection/OpcuaConnectionFactory.java   |   5 +-
 .../opcua/connection/OpcuaTcpPlcConnection.java    | 307 ++++++++++++---------
 .../plc4x/java/opcua/protocol/OpcuaField.java      |   9 +-
 .../java/opcua/protocol/OpcuaPlcFieldHandler.java  |  28 +-
 .../opcua/protocol/OpcuaSubsriptionHandle.java     |  44 +--
 .../java/opcua/protocol/model/OpcuaDataTypes.java  |   5 +-
 .../opcua/protocol/model/OpcuaIdentifierType.java  |  12 +-
 .../apache/plc4x/java/opcua/ManualPLC4XOpcua.java  |  93 +++++--
 .../plc4x/java/opcua/OpcuaPlcDriverTest.java       |   5 +-
 .../org/apache/plc4x/java/opcua/UtilsTest.java     |   5 +-
 .../connection/OpcuaTcpPlcConnectionTest.java      |  59 +++-
 .../plc4x/java/opcua/protocol/OpcuaFieldTest.java  |   5 +-
 .../opcua/protocol/OpcuaPlcFieldHandlerTest.java   |   5 +-
 .../protocol/OpcuaSubscriptionHandleTest.java      |   5 +-
 17 files changed, 400 insertions(+), 215 deletions(-)