You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ms...@apache.org on 2019/05/10 13:43:33 UTC
[plc4x] 04/09: Merge branch 'develop' of
https://gitbox.apache.org/repos/asf/plc4x into develop
This is an automated email from the ASF dual-hosted git repository.
msommer pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 003477d5156db431d33715a2761f0e071fc42390
Merge: 9f936ee 44bd9d0
Author: Markus Sommer <ms...@apache.org>
AuthorDate: Fri May 3 09:31:02 2019 +0200
Merge branch 'develop' of https://gitbox.apache.org/repos/asf/plc4x into develop
.gitignore | 5 +-
Jenkinsfile | 4 +-
README | 62 +
.../300ppi/PLC4X logo without mascot@300x.png | Bin 0 -> 18418 bytes
media/logos/300ppi/PLC4X.png | Bin 0 -> 87342 bytes
media/logos/300ppi/logo PLC4X black line@300x.png | Bin 0 -> 50768 bytes
media/logos/300ppi/logo PLC4X color CMYK@300x.png | Bin 0 -> 87342 bytes
media/logos/300ppi/logo PLC4X on dark bg@300x.png | Bin 0 -> 86925 bytes
media/logos/300ppi/logo PLC4X white line@300x.png | Bin 0 -> 46417 bytes
.../mascot color with apache feather@300x.png | Bin 0 -> 127847 bytes
.../300ppi/mascot color without feather@300x.png | Bin 0 -> 91523 bytes
media/logos/PDF/PLC4X logo without mascot.pdf | Bin 0 -> 66597 bytes
media/logos/PDF/logo PLC4X black line.pdf | Bin 0 -> 123655 bytes
media/logos/PDF/logo PLC4X color CMYK@300x.pdf | Bin 0 -> 252702 bytes
media/logos/PDF/logo PLC4X on dark bg.pdf | Bin 0 -> 252970 bytes
media/logos/PDF/logo PLC4X white line.pdf | Bin 0 -> 123558 bytes
.../logos/PDF/mascot color with apache feather.pdf | Bin 0 -> 271570 bytes
media/logos/PDF/mascot color without feather.pdf | Bin 0 -> 249178 bytes
media/logos/SVG/PLC4X logo without mascot.svg | 59 +
media/logos/SVG/logo PLC4X black line.svg | 1598 +++++++++++++
media/logos/SVG/logo PLC4X color CMYK@300x.svg | 1492 ++++++++++++
media/logos/SVG/logo PLC4X on dark bg.svg | 1492 ++++++++++++
media/logos/SVG/logo PLC4X white line.svg | 1598 +++++++++++++
.../logos/SVG/mascot color with apache feather.svg | 2462 ++++++++++++++++++++
media/logos/SVG/mascot color without feather.svg | 1403 +++++++++++
plc4cpp/README.md | 8 +-
plc4cpp/api/CMakeLists.txt | 2 +-
plc4cpp/api/pom.xml | 51 +-
plc4cpp/api/src/assembly/cpp.xml | 47 +
plc4cpp/libs/boost/pom.xml | 158 ++
plc4cpp/libs/boost/src/assembly/cpp-windows.xml | 47 +
.../libs/boost/src/assembly/cpp.xml | 51 +-
plc4cpp/libs/pom.xml | 122 +-
plc4cpp/pom.xml | 162 +-
.../pom.xml => plc4cpp/protocols/CMakeLists.txt | 29 +-
.../protocols/driver-bases/CMakeLists.txt | 29 +-
plc4cpp/protocols/driver-bases/base/CMakeLists.txt | 3 +-
plc4cpp/protocols/driver-bases/base/pom.xml | 54 +-
.../driver-bases/base/src/assembly/cpp.xml | 47 +
protocols/pom.xml => plc4cpp/utils/CMakeLists.txt | 29 +-
plc4cpp/utils/logger/CMakeLists.txt | 3 +-
.../driver-bases/base => utils/logger}/pom.xml | 62 +-
plc4cpp/utils/logger/src/assembly/cpp.xml | 47 +
{protocols => plc4cpp/utils}/pom.xml | 16 +-
plc4j/drivers/s7/pom.xml | 6 -
.../java/s7/connection/S7PlcConnectionIT.java | 2 +
.../java/ads/protocol/Plc4x2AdsProtocolTest.java | 3 +
.../java/modbus/netty/Plc4XModbusProtocolTest.java | 17 -
plc4j/utils/interop/pom.xml | 198 ++
plc4j/utils/interop/src/assembly/assembly.xml | 41 +
.../java/org/apache/plc4x/interop/impl/Client.java | 60 +
.../org/apache/plc4x/interop/impl/Handler.java | 160 ++
.../java/org/apache/plc4x/interop/impl/Server.java | 91 +
plc4j/utils/pom.xml | 9 +
plc4py/README.md | 58 +
plc4py/pom.xml | 201 ++
plc4py/setup.py | 67 +
plc4py/src/assembly/python.xml | 47 +
plc4py/src/main/python/__init__.py | 26 +
plc4py/src/main/python/org/__init__.py | 17 +
plc4py/src/main/python/org/apache/__init__.py | 17 +
.../main/python/org/apache/plc4x/InteropClient.py | 45 +
.../main/python/org/apache/plc4x/PlcConnection.py | 75 +
.../python/org/apache/plc4x/PlcDriverManager.py | 78 +
.../src/main/python/org/apache/plc4x/__init__.py | 17 +
plc4py/src/main/resources/lib/log4j2.xml | 32 +
plc4py/src/test/python/__init__.py | 26 +
plc4py/src/test/python/org/__init__.py | 26 +
plc4py/src/test/python/org/apache/__init__.py | 26 +
.../src/test/python/org/apache/plc4x/__init__.py | 17 +
.../org/apache/plc4x/test_PlcDriverManager.py | 142 ++
pom.xml | 121 +-
protocols/pom.xml | 12 +
protocols/{ => proxy}/pom.xml | 16 +-
protocols/proxy/src/main/java/.keepMe | 20 +
.../apache/plc4x/protocols/proxy/interop.thrift | 93 +
sandbox/dynamic-driver-s7/pom.xml | 5 +
src/site/asciidoc/index.adoc | 14 +-
src/site/resources/plc4x-doap.rdf | 5 +-
tools/README.md | 72 +
{protocols => tools}/pom.xml | 19 +-
tools/thrift/pom.xml | 246 ++
.../thrift/src/assembly/compiler.xml | 50 +-
.../pom.xml => tools/thrift/src/assembly/cpp.xml | 48 +-
tools/thrift/src/assembly/python.xml | 54 +
85 files changed, 12915 insertions(+), 506 deletions(-)