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/05/07 09:11:47 UTC
[plc4x] 01/01: - Updated the banch with latest changed from develop
...
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/sorted-examples-integrations
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit b3555d46ff0da71f11f15b21a1f1e6d7306807fb
Merge: 5bb6338 d7598ad
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue May 7 11:11:35 2019 +0200
- Updated the banch with latest changed from develop ...
.gitignore | 1 +
.vscode/settings.json | 8 +
Jenkinsfile | 4 +-
README | 21 +-
plc4cpp/pom.xml | 5 +
.../apache-kafka/config/sink.properties | 28 +-
.../apache-kafka/config/source.properties | 28 +-
.../java/ads/protocol/Plc4x2AdsProtocolTest.java | 1 +
.../java/modbus/netty/Plc4XModbusProtocolTest.java | 19 --
plc4j/src/site/asciidoc/users/gettingstarted.adoc | 178 +++++++++++
plc4j/utils/interop/pom.xml | 2 +-
plc4net/.gitignore | 344 +++++++++++++++++++++
plc4net/api/PlcDriverManager.cs | 104 +++++++
plc4net/api/api.csproj | 27 ++
plc4net/api/api/IPlcConnection.cs | 89 ++++++
plc4net/api/api/IPlcDriver.cs | 57 ++++
.../api/api/authentication/IPlcAuthentication.cs | 29 ++
.../PlcUsernamePasswordAuthentication.cs | 48 +++
plc4net/api/api/metadata/IPlcConnectionMetadata.cs | 39 +++
plc4net/api/exceptions/PlcConnectionException.cs | 50 +++
plc4net/api/exceptions/PlcException.cs | 50 +++
plc4net/api/exceptions/PlcInvalidFieldException.cs | 46 +++
plc4net/api/messages/IPlcFieldRequest.cs | 52 ++++
plc4net/api/messages/IPlcFieldResponse.cs | 49 +++
plc4net/api/messages/IPlcMessage.cs | 29 ++
plc4net/api/messages/IPlcReadRequest.cs | 29 ++
plc4net/api/messages/IPlcReadRequestBuilder.cs | 35 +++
plc4net/api/messages/IPlcReadResponse.cs | 29 ++
plc4net/api/messages/IPlcRequest.cs | 36 +++
plc4net/api/messages/IPlcRequestBuilder.cs | 34 ++
plc4net/api/messages/IPlcResponse.cs | 33 ++
plc4net/api/messages/IPlcSubscriptionEventArgs.cs | 35 +++
plc4net/api/messages/IPlcSubscriptionRequest.cs | 29 ++
.../api/messages/IPlcSubscriptionRequestBuilder.cs | 54 ++++
plc4net/api/messages/IPlcSubscriptionResponse.cs | 42 +++
plc4net/api/messages/IPlcUnsubscriptionRequest.cs | 29 ++
.../messages/IPlcUnsubscriptionRequestBuilder.cs | 45 +++
plc4net/api/messages/IPlcUnsubscriptionResponse.cs | 29 ++
plc4net/api/messages/IPlcWriteRequest.cs | 32 ++
plc4net/api/messages/IPlcWriteRequestBuilder.cs | 134 ++++++++
plc4net/api/model/IPlcField.cs | 39 +++
plc4net/api/model/IPlcSubscriptionHandle.cs | 35 +++
{plc4cpp => plc4net/api}/pom.xml | 48 +--
plc4net/api/types/PlcResponseCode.cs | 35 +++
plc4net/plc4net.driver/plc4net.driver.csproj | 29 ++
{plc4cpp => plc4net/plc4net.driver}/pom.xml | 44 +--
plc4net/plc4net.sln | 44 +++
{plc4cpp => plc4net}/pom.xml | 36 +--
plc4py/initialize_interop_server.sh | 29 --
plc4py/pom.xml | 77 ++++-
plc4py/setup.py | 67 ++++
{tools/thrift => plc4py}/src/assembly/python.xml | 23 +-
plc4py/{ => src/main/python}/__init__.py | 0
plc4py/{test => src/main/python/org}/__init__.py | 0
.../main/python/org/apache}/__init__.py | 0
.../main/python}/org/apache/plc4x/InteropClient.py | 5 +-
.../main/python}/org/apache/plc4x/PlcConnection.py | 0
.../python}/org/apache/plc4x/PlcDriverManager.py | 2 +-
.../main/python/org/apache/plc4x}/__init__.py | 0
plc4py/{ => src/main/resources}/lib/log4j2.xml | 0
plc4py/{ => src/test/python}/__init__.py | 0
plc4py/{ => src/test/python/org}/__init__.py | 0
.../{ => src/test/python/org/apache}/__init__.py | 0
.../test/python/org/apache/plc4x}/__init__.py | 0
.../org/apache/plc4x}/test_PlcDriverManager.py | 3 +-
pom.xml | 50 ++-
src/site/asciidoc/developers/conferences.adoc | 2 +-
src/site/asciidoc/users/gettingstarted.adoc | 3 +
tools/thrift/src/assembly/python.xml | 7 +
69 files changed, 2327 insertions(+), 184 deletions(-)
diff --cc Jenkinsfile
index 93e0c5f,7e64940..2784eed
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@@ -106,7 -106,7 +106,7 @@@ pipeline
// We'll deploy to a relative directory so we can save
// that and deploy in a later step on a different node
- sh 'mvn -P${JENKINS_PROFILE},development,with-cpp,with-python,with-proxies,with-sandbox ${MVN_TEST_FAIL_IGNORE} ${JQASSISTANT_NEO4J_VERSION} -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy'
- sh 'mvn -P${JENKINS_PROFILE},development,with-cpp,with-dotnet,with-python,with-proxies,with-sandbox ${MVN_TEST_FAIL_IGNORE} ${JQASSISTANT_NEO4J_VERSION} -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy'
++ sh 'mvn -P${JENKINS_PROFILE},development,with-cpp,with-java,with-dotnet,with-python,with-proxies,with-sandbox ${MVN_TEST_FAIL_IGNORE} ${JQASSISTANT_NEO4J_VERSION} -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy'
// Stash the build results so we can deploy them on another node
stash name: 'plc4x-build-snapshots', includes: 'local-snapshots-dir/**'
@@@ -126,7 -126,7 +126,7 @@@
steps {
echo 'Checking Code Quality'
withSonarQubeEnv('ASF Sonar Analysis') {
- sh 'mvn -P${JENKINS_PROFILE} sonar:sonar'
- sh 'mvn -P${JENKINS_PROFILE},with-cpp,with-dotnet,with-python,with-proxies sonar:sonar'
++ sh 'mvn -P${JENKINS_PROFILE},with-cpp,with-java,with-dotnet,with-python,with-proxies sonar:sonar'
}
}
}
diff --cc plc4py/src/main/python/org/apache/plc4x/PlcDriverManager.py
index 4ce9dc3,8f98e63..aa68418
--- a/plc4py/src/main/python/org/apache/plc4x/PlcDriverManager.py
+++ b/plc4py/src/main/python/org/apache/plc4x/PlcDriverManager.py
@@@ -18,7 -18,7 +18,8 @@@
import subprocess
import time
import warnings
+
+ from generated.org.apache.plc4x.interop.InteropServer import Client, PlcException
from thrift.protocol import TBinaryProtocol
from thrift.transport import TSocket, TTransport
from thrift.transport.TTransport import TTransportException
diff --cc plc4py/src/test/python/org/apache/plc4x/test_PlcDriverManager.py
index aba3a28,63d4e0d..0373565
--- a/plc4py/src/test/python/org/apache/plc4x/test_PlcDriverManager.py
+++ b/plc4py/src/test/python/org/apache/plc4x/test_PlcDriverManager.py
@@@ -20,8 -20,8 +20,9 @@@ import unittes
from subprocess import Popen
from unittest import TestCase
++from generated.org.apache.plc4x.interop.InteropServer import Request, PlcException
++
from org.apache.plc4x.PlcDriverManager import PlcDriverManager
- from generated.org.apache.plc4x.interop.InteropServer import Client, Request, PlcException
if __name__ == '__main__':
unittest.main()
diff --cc pom.xml
index 45e800e,7129389..c84dbf3
--- a/pom.xml
+++ b/pom.xml
@@@ -1215,6 -1247,13 +1227,23 @@@
</modules>
</profile>
++ <!-- Build PLC4X including the Java modules -->
++ <profile>
++ <id>with-java</id>
++ <modules>
++ <module>plc4j</module>
++ </modules>
++ </profile>
++
++ <!-- Build PLC4X including the .Net modules -->
+ <profile>
+ <id>with-dotnet</id>
+ <modules>
+ <module>plc4net</module>
+ </modules>
+ </profile>
+
++ <!-- Build PLC4X including the Python modules -->
<profile>
<id>with-python</id>
<modules>
@@@ -1222,7 -1261,7 +1251,7 @@@
</modules>
</profile>
-- <!-- Build PLC4X including the CPP modules -->
++ <!-- Build PLC4X including the Sandbox modules -->
<profile>
<id>with-sandbox</id>
<modules>
@@@ -1230,6 -1269,6 +1259,11 @@@
</modules>
</profile>
++ <!-- Profile, which is used in sub-modules to enable Thrift related proxy modules -->
++ <profile>
++ <id>with-proxies</id>
++ </profile>
++
<!-- Profile for linux -->
<profile>
<id>unix</id>