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 2019/12/07 19:22:58 UTC
[plc4x] branch PLC4X-157OPC-UADisablediscovery updated (77c0b4b ->
f924075)
This is an automated email from the ASF dual-hosted git repository.
nalim2 pushed a change to branch PLC4X-157OPC-UADisablediscovery
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from 77c0b4b [fix] removed start of the own OPC test server
add 4bb44c2 PLC4X-151 Build for boost fails on Jenkins - Re-enabled the boost build to see what the problem is.
add c05bf9e PLC4X-151 Build for boost fails on Jenkins - Fixed the parent pom coordinates inside the .net modules
add 5447a45 PLC4X-151 Build for boost fails on Jenkins - Tried to make Boost build with clang instead of gcc to reduce the amount of memory needed.
add 848e185 PLC4X-151 Build for boost fails on Jenkins - Added some documentation on alternates to calculate the keys for the VM - Removed something committed which shouldn't have been there - Bumped the CMake version to hopefully fix the build on jenkins again.
add 2bc6b5c PLC4X-151 Build for boost fails on Jenkins - Disabled the non java things on Jenkins again
add d3ebc94 Fixed a layouting problem with the check script
new a288a37 Merge branches 'develop' and 'PLC4X-157OPC-UADisablediscovery' of https://gitbox.apache.org/repos/asf/plc4x into develop
new f924075 [fix] regex rule assumed a "/" after the port if a param is attached
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 9 +++++----
.../org/apache/plc4x/java/opcua/OpcuaPlcDriver.java | 2 +-
.../org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java | 2 ++
pom.xml | 2 +-
sandbox/plc4net/api/pom.xml | 2 +-
sandbox/plc4net/plc4net.driver/pom.xml | 2 +-
src/main/script/prerequisiteCheck.groovy | 17 +++++++++++++++++
src/site/asciidoc/developers/vm.adoc | 14 +++++++-------
tools/boost/pom.xml | 3 ++-
9 files changed, 37 insertions(+), 16 deletions(-)
[plc4x] 02/02: [fix] regex rule assumed a "/" after the port if a
param is attached
Posted by na...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nalim2 pushed a commit to branch PLC4X-157OPC-UADisablediscovery
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit f924075c05e85c62970a09a15deb2f07b6a27e3f
Author: Matthias Milan Strljic <ma...@gmail.com>
AuthorDate: Sat Dec 7 11:17:01 2019 -0800
[fix] regex rule assumed a "/" after the port if a param is attached
Signed-off-by: Matthias Milan Strljic <Ma...@gmail.com>
---
.../opcua/src/main/java/org/apache/plc4x/java/opcua/OpcuaPlcDriver.java | 2 +-
.../src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/OpcuaPlcDriver.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/OpcuaPlcDriver.java
index 82d1c02..b627aa1 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/OpcuaPlcDriver.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/OpcuaPlcDriver.java
@@ -43,7 +43,7 @@ public class OpcuaPlcDriver implements PlcDriver {
public static final Pattern INET_ADDRESS_PATTERN = Pattern.compile("tcp://(?<host>[\\w.-]+)(:(?<port>\\d*))?");
public static final Pattern OPCUA_URI_PARAM_PATTERN = Pattern.compile("(?<param>[(\\?|\\&)([^=]+)\\=([^&]+)]+)?"); //later used for regex filtering of the params
- public static final Pattern OPCUA_URI_PATTERN = Pattern.compile("^opcua:(" + INET_ADDRESS_PATTERN + ")?" + "(?<params>/[\\w/=?&]+)?");
+ public static final Pattern OPCUA_URI_PATTERN = Pattern.compile("^opcua:(" + INET_ADDRESS_PATTERN + ")?" + "(?<params>[\\w/=?&]+)?");
private static final int requestTimeout = 10000;
private OpcuaConnectionFactory opcuaConnectionFactory;
diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java
index efdfc4c..b138ba3 100644
--- a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java
+++ b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java
@@ -62,6 +62,8 @@ public class OpcuaPlcDriverTest {
assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://254.254.254.254:1337");
assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://254.254.254.254");
+ assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://127.0.0.1&nDiscovery=true");
+ assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://opcua.demo-this.com:51210/UA/SampleServer&nDiscovery=true");
}
[plc4x] 01/02: Merge branches 'develop' and
'PLC4X-157OPC-UADisablediscovery' of
https://gitbox.apache.org/repos/asf/plc4x into develop
Posted by na...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nalim2 pushed a commit to branch PLC4X-157OPC-UADisablediscovery
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit a288a37efe9734649f4e087aa0fde06e82046153
Merge: d3ebc94 77c0b4b
Author: Matthias Milan Strljic <Ma...@gmail.com>
AuthorDate: Sat Dec 7 11:09:12 2019 -0800
Merge branches 'develop' and 'PLC4X-157OPC-UADisablediscovery' of https://gitbox.apache.org/repos/asf/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(-)