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:46 UTC
[plc4x] branch feature/sorted-examples-integrations updated
(5bb6338 -> b3555d4)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch feature/sorted-examples-integrations
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from 5bb6338 - Refactored the project structure to include examples and integration modules to the plc4x language they are based on.
add 0a34e43 - Added missing profiles to the Jenkinsfile
add 0414ac9 - Added python and c++ modules to the SonarQube analysis
add 4ede511 PLC4X-114 - Some tests fail starting with Java 12 - Seems for the modbus driver the code was not needed (Removed the code in question)
add 809de68 - Refactroed the structure of the python module to be more like the other modules
add f375795 - Added the maven-assembly-plugin to package assemblies.
add ef5c829 - Tried to tell sonarqube about c++ and python
add bff2e39 - Disabled forcing the language in Python and C++ as Apache's SonarQube currently doesn't support these languages.
add 174afb5 - Added a first trivial setup.py that gets the important parts from loading the pom.xml in the same directory.
add 1ffe05a Fixed mailto: bug for subscribe links on the mailing-list side.
add 580a9a2 Revert "Fixed mailto: bug for subscribe links on the mailing-list side."
add 60640ec PLC4X-117 - Subscription links on the website not working - Fixed the links
add 894dead - Integrated the call to setup.py to maven - Made sure the python build is run inside target/python directory and not in the module root
add 44bd9d0 PLC4X-117 - Subscription links on the website not working - Added the mailto to the post email address - Added the issues list
add 616c3d6 - Streamlined the calls to run python to be equal for compile and package
add f37a80e - Removed the double import of plc4py
add a1caea1 - Added a new exclusion for Eclipse settings files ".factorypath"
add 51f8781 [PLC4X-110] Added VS solution and project
add 738f5ac [PLC4X-110] Added core class implementation
add 70cffb1 [PLC4X-110] Implemented messages and builders
add a0948e6 Added vscode files to gitignore
add a458f64 Merge branch 'feature/plc4net' of https://github.com/bjoernhoeper/incubator-plc4x into bjoernhoeper-feature/plc4net
add 01fc7a4 - Fine tuned the build and integrated it to maven
add 2e6085f Merge branch 'bjoernhoeper-feature/plc4net' into develop
add f6548ed - Moved up the format descriptor to the top or visual studio won't be able to read the solution.
add c59147b - Added some documentation on how to use PLC4J - Added a warning to the windows installation guide (If you don't run the setup, things will be problematic)
add 68bf9f2 - Enabled the .Net build in the Jenkinsfile
add 2e439a3 Fix link to material
add 3e712a6 Merge pull request #62 from NiklasMerz/fix-link
add d7598ad - Added support for intel based mac systems
new b3555d4 - Updated the banch with latest changed from develop ...
The 1 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:
.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 +++++++
.../api/api.csproj | 14 +-
plc4net/api/api/IPlcConnection.cs | 89 ++++++
plc4net/api/api/IPlcDriver.cs | 57 ++++
.../api/api/authentication/IPlcAuthentication.cs | 16 +-
.../PlcUsernamePasswordAuthentication.cs | 48 +++
.../api/api/metadata/IPlcConnectionMetadata.cs | 52 ++--
.../api/exceptions/PlcConnectionException.cs | 37 ++-
.../api/exceptions/PlcException.cs | 39 ++-
.../api/exceptions/PlcInvalidFieldException.cs | 33 +-
plc4net/api/messages/IPlcFieldRequest.cs | 52 ++++
plc4net/api/messages/IPlcFieldResponse.cs | 49 +++
.../api/messages/IPlcMessage.cs | 14 +-
.../api/messages/IPlcReadRequest.cs | 28 +-
.../api/messages/IPlcReadRequestBuilder.cs | 30 +-
.../api/messages/IPlcReadResponse.cs | 27 +-
.../api/messages/IPlcRequest.cs | 25 +-
.../api/messages/IPlcRequestBuilder.cs | 25 +-
.../api/messages/IPlcResponse.cs | 20 +-
.../api/messages/IPlcSubscriptionEventArgs.cs | 24 +-
.../api/messages/IPlcSubscriptionRequest.cs | 14 +-
.../api/messages/IPlcSubscriptionRequestBuilder.cs | 54 ++++
.../api/messages/IPlcSubscriptionResponse.cs | 33 +-
.../api/messages/IPlcUnsubscriptionRequest.cs | 28 +-
.../messages/IPlcUnsubscriptionRequestBuilder.cs | 45 +++
.../api/messages/IPlcUnsubscriptionResponse.cs | 16 +-
.../api/messages/IPlcWriteRequest.cs | 19 +-
plc4net/api/messages/IPlcWriteRequestBuilder.cs | 134 ++++++++
plc4net/api/model/IPlcField.cs | 39 +++
.../api/model/IPlcSubscriptionHandle.cs | 24 +-
{plc4cpp => plc4net/api}/pom.xml | 48 +--
.../api/types/PlcResponseCode.cs | 22 +-
.../plc4net.driver/plc4net.driver.csproj | 20 +-
{plc4cpp => plc4net/plc4net.driver}/pom.xml | 44 +--
plc4net/plc4net.sln | 44 +++
{sandbox => plc4net}/pom.xml | 16 +-
plc4py/initialize_interop_server.sh | 29 --
plc4py/pom.xml | 77 ++++-
plc4py/setup.py | 67 ++++
.../cpp.xml => plc4py/src/assembly/python.xml | 15 +-
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, 1871 insertions(+), 411 deletions(-)
create mode 100644 .vscode/settings.json
create mode 100644 plc4j/src/site/asciidoc/users/gettingstarted.adoc
create mode 100644 plc4net/.gitignore
create mode 100644 plc4net/api/PlcDriverManager.cs
copy protocols/knxnet-ip/src/main/resources/daffodil-built-in-catalog.xml => plc4net/api/api.csproj (80%)
create mode 100644 plc4net/api/api/IPlcConnection.cs
create mode 100644 plc4net/api/api/IPlcDriver.cs
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedOperationException.java => plc4net/api/api/authentication/IPlcAuthentication.cs (77%)
create mode 100644 plc4net/api/api/authentication/PlcUsernamePasswordAuthentication.cs
copy plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcRequest.h => plc4net/api/api/metadata/IPlcConnectionMetadata.cs (60%)
copy plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ConstantsTest.java => plc4net/api/exceptions/PlcConnectionException.cs (53%)
copy plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ConstantsTest.java => plc4net/api/exceptions/PlcException.cs (53%)
copy plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ConstantsTest.java => plc4net/api/exceptions/PlcInvalidFieldException.cs (56%)
create mode 100644 plc4net/api/messages/IPlcFieldRequest.cs
create mode 100644 plc4net/api/messages/IPlcFieldResponse.cs
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestBuilder.java => plc4net/api/messages/IPlcMessage.cs (81%)
copy plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/ChannelFactory.cpp => plc4net/api/messages/IPlcReadRequest.cs (79%)
copy plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ConstantsTest.java => plc4net/api/messages/IPlcReadRequestBuilder.cs (56%)
copy plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryRequest.cpp => plc4net/api/messages/IPlcReadResponse.cs (78%)
copy plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelOption.java => plc4net/api/messages/IPlcRequest.cs (62%)
copy plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelOption.java => plc4net/api/messages/IPlcRequestBuilder.cs (61%)
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedOperationException.java => plc4net/api/messages/IPlcResponse.cs (70%)
copy plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelOption.java => plc4net/api/messages/IPlcSubscriptionEventArgs.cs (68%)
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedOperationException.java => plc4net/api/messages/IPlcSubscriptionRequest.cs (78%)
create mode 100644 plc4net/api/messages/IPlcSubscriptionRequestBuilder.cs
copy plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/ConstantsTest.java => plc4net/api/messages/IPlcSubscriptionResponse.cs (51%)
copy plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/ChannelFactory.cpp => plc4net/api/messages/IPlcUnsubscriptionRequest.cs (79%)
create mode 100644 plc4net/api/messages/IPlcUnsubscriptionRequestBuilder.cs
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedOperationException.java => plc4net/api/messages/IPlcUnsubscriptionResponse.cs (78%)
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedOperationException.java => plc4net/api/messages/IPlcWriteRequest.cs (71%)
create mode 100644 plc4net/api/messages/IPlcWriteRequestBuilder.cs
create mode 100644 plc4net/api/model/IPlcField.cs
copy plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelOption.java => plc4net/api/model/IPlcSubscriptionHandle.cs (65%)
copy {plc4cpp => plc4net/api}/pom.xml (55%)
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedOperationException.java => plc4net/api/types/PlcResponseCode.cs (72%)
copy plc4j/integrations/apache-nifi/nifi-plc4x-nar/false-positives.xml => plc4net/plc4net.driver/plc4net.driver.csproj (70%)
copy {plc4cpp => plc4net/plc4net.driver}/pom.xml (61%)
create mode 100644 plc4net/plc4net.sln
copy {sandbox => plc4net}/pom.xml (76%)
delete mode 100755 plc4py/initialize_interop_server.sh
create mode 100644 plc4py/setup.py
copy plc4cpp/libs/boost/src/assembly/cpp.xml => plc4py/src/assembly/python.xml (76%)
copy plc4py/{ => src/main/python}/__init__.py (100%)
rename plc4py/{test => src/main/python/org}/__init__.py (100%)
rename plc4py/{org/apache/plc4x => src/main/python/org/apache}/__init__.py (100%)
rename plc4py/{ => src/main/python}/org/apache/plc4x/InteropClient.py (98%)
rename plc4py/{ => src/main/python}/org/apache/plc4x/PlcConnection.py (100%)
rename plc4py/{ => src/main/python}/org/apache/plc4x/PlcDriverManager.py (100%)
rename plc4py/{org/apache => src/main/python/org/apache/plc4x}/__init__.py (100%)
rename plc4py/{ => src/main/resources}/lib/log4j2.xml (100%)
copy plc4py/{ => src/test/python}/__init__.py (100%)
copy plc4py/{ => src/test/python/org}/__init__.py (100%)
rename plc4py/{ => src/test/python/org/apache}/__init__.py (100%)
rename plc4py/{org => src/test/python/org/apache/plc4x}/__init__.py (100%)
rename plc4py/{test => src/test/python/org/apache/plc4x}/test_PlcDriverManager.py (97%)
[plc4x] 01/01: - Updated the banch with latest changed from develop
...
Posted by cd...@apache.org.
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>