You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by jf...@apache.org on 2018/10/04 07:23:48 UTC
[incubator-plc4x] branch opm-plcentitymanager updated (49b4708 ->
a72f383)
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a change to branch opm-plcentitymanager
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from 49b4708 Finished first Implementation of OPM.
add 4a95fb3 - Switched to the last released version of Apache Edgent - Added dependencyManagement to the kafka example to fix cve problems which will be fixed by new edgent versions
add 38febac ADS/General fixed date handling
add 08e6bbb - Added the oss sonatype release repo to the repo-list for this module - Changed the enip driver to the release version
add f0f09af [maven-release-plugin] rollback the release of plc4x-parent-0.1.0
add 3bc5d6a - Changed the enip driver to the release version
add 21f5386 [General] added remaining datatypes for FieldItem
add 352375c [maven-release-plugin] prepare release plc4x-parent-0.1.0
add 49f93e6 [maven-release-plugin] prepare for next development iteration
add e22e344 [maven-release-plugin] rollback the release of plc4x-parent-0.1.0
add af14dd9 removed old files
add 98976eb Merge branch 'feature/api-redesign-chris-c' of https://github.com/skorikov/incubator-plc4x into skorikov-feature/api-redesign-chris-c
add 86fb5db Merge branch 'skorikov-feature/api-redesign-chris-c'
add 8cd6926 Fixed dependency problems.
add bb403f2 - Added a reminder to eventually clean up the dependencies.
add 7f7363f [maven-release-plugin] prepare release plc4x-parent-0.1.0
add c350696 [maven-release-plugin] rollback the release of plc4x-parent-0.1.0
add 45d2cc8 [maven-release-plugin] prepare release plc4x-parent-0.1.0
add d4f80a7 [maven-release-plugin] prepare for next development iteration
add f26f990 - Added tools for checking PLC4X releases
add 9cd6be8 - Removed the NOTICE block on the Reflow-Skin as we no longer contain code of this in our repo and release.
add 87a2368 - Added missing README and RELEASE_NOTES files.
add 11ce613 - Merged the new and the old README.md and removed the Markdown version after that.
add 7a1456a - Added some first documentation on the release process - Added a plugin to the root pom that additionally creates MD5 and SHA512 hashes for the release artifacts
add 8c1e0c1 [maven-release-plugin] prepare release plc4x-parent-0.1.0-rc2
add 5064145 [maven-release-plugin] prepare for next development iteration
add 946defc - Fixed a deprecated maven property.
add 7a92960 [Modbus] re-enable basic modbus support [General] added byte[] and BigDecimal support in FieldHandlers [General] added abstract field handler which throws exceptions by default [Test] added hex util for tests to convert byte[] to hex
add 865fc9e [General] fixed broken getAllByteArrays implementation
add f74c7bf [Modbus] added possibility to add a quantity to addresses to read multiple values.
add 34bac1f [Modbus] added example to read an int from 2 registers [General] changed byte[] to Byte[] to avoid recurring boxing problems
add ff580e7 Added note for Service Loader.
add d64c3e2 Merge pull request #23 from JulianFeinauer/master
add 523ada0 [General] added some utility methods to requests and responses.
add f9707df PLC4X-60 - Fix findings by the last release
add ee88f24 PLC4X-60 - Fix findings by the last release
add b482930 PLC4X-60 - Fix findings by the last release
add e292f32 PLC4X-60 - Fix findings by the last release
add e31e741 PLC4X-56 - [S7] S7Field does not recognize addresses with numElements present
add 374fd74 PLC4X-56 - [S7] S7Field does not recognize addresses with numElements present
add d57e7ea PLC4X-54 - Installation Process isn't working SSL Errors
add 776f2b7 PLC4X-56 - [S7] S7Field does not recognize addresses with numElements present
add d594ff6 [General] updated mockito and added assertj for easier testing.
add 3d7494f Introduced protocol layer to split requestItems to several requests.
add a53cbbf [General] some progress on the SingleItemToSingleRequestProtocol
add 5afff50 [General] SingleItemToSingleRequestProtocol implemented ErrorHandler
add 33e754b [General] SingleItemToSingleRequestProtocol small Bugfixes
add e36b6b2 [General] SingleItemToSingleRequestProtocol added abstract javadoc
add 6703953 [General] SingleItemToSingleRequestProtocol replace throwing of RuntimeExceptions with log statements.
add 327cc6f [General] updated mockito and added assertj for easier testing.
add b2f0fa3 [MODBUS/ADS] Integrate SingleItemToSingleRequestProtocol for now
add f619b13 Added example of Object-Plc-Mapping.
add 66bf9d9 Changed according to new api.
add 95ca0fe Added new Test and feature.
add 485cfa8 Did some stuff.
add 03b8f03 Current state.
add 17dde04 Added note for Service Loader.
add b65f5ee state.
add b4fc6e1 Added complete "connect" functionality. Ready for some review??
add 50c71bc Small fixes, added logging.
add 4fe9766 Added Documentation.
add e675472 Finished first Implementation of OPM.
add a72f383 Merge remote-tracking branch 'origin/opm-plcentitymanager' into opm-plcentitymanager
No new revisions were added by this update.
Summary of changes:
NOTICE | 5 +-
README | 64 ++
README.md | 64 --
RELEASE_NOTES | 45 +
examples/azure/pom.xml | 12 +-
examples/dummy-driver/pom.xml | 11 +-
examples/google/pom.xml | 12 +-
.../google/iotcore/S7PlcToGoogleIoTCoreSample.java | 24 +-
.../google/src/remote-resources/META-INF/LICENSE | 5 +
examples/hello-plc4x/pom.xml | 11 +-
examples/iot-factory/pom.xml | 9 +-
examples/iotree/pom.xml | 9 +-
examples/kafka-bridge/pom.xml | 50 +-
examples/plclogger/pom.xml | 9 +-
examples/pom.xml | 5 +-
integrations/apache-brooklyn/pom.xml | 5 +-
integrations/apache-camel/pom.xml | 13 +-
integrations/apache-edgent/pom.xml | 17 +-
.../plc4x/edgent/PlcConnectionAdapterTest.java | 6 +-
.../org/apache/plc4x/edgent/PlcFunctionsTest.java | 223 +++--
.../apache/plc4x/edgent/mock/MockFieldHandler.java | 10 +
integrations/apache-kafka/README.md | 34 +-
integrations/apache-kafka/bin/debug.sh | 29 -
.../config/Plc4xSinkConnector.properties | 23 -
.../config/Plc4xSourceConnector.properties | 21 -
.../config/connect-avro-docker.properties | 44 -
integrations/apache-kafka/config/sink.properties | 25 +
integrations/apache-kafka/config/source.properties | 24 +
integrations/apache-kafka/docker-compose.yml | 45 -
integrations/apache-kafka/pom.xml | 54 +-
.../apache-kafka/src/main/assembly/package.xml | 59 --
.../org/apache/plc4x/kafka/Plc4xSourceTask.java | 7 +-
.../apache/plc4x/kafka/Plc4xSinkConnectorTest.java | 30 -
.../org/apache/plc4x/kafka/Plc4xSinkTaskTest.java | 30 -
.../plc4x/kafka/Plc4xSourceConnectorTest.java | 30 -
.../apache/plc4x/kafka/Plc4xSourceTaskTest.java | 30 -
.../apache-kafka/src/test/resources/logback.xml | 29 -
integrations/apache-mynewt/pom.xml | 5 +-
integrations/pom.xml | 5 +-
mvnw.cmd | 2 +-
plc4c/pom.xml | 5 +-
plc4j/api/pom.xml | 7 +-
.../java/org/apache/plc4x/java/api/PlcDriver.java | 4 +
.../plc4x/java/api/messages/PlcReadResponse.java | 23 +-
.../plc4x/java/api/messages/PlcWriteRequest.java | 7 +
plc4j/core/pom.xml | 13 +-
plc4j/pom.xml | 5 +-
plc4j/protocols/ads/pom.xml | 17 +-
.../ads/connection/AdsSerialPlcConnection.java | 2 +
.../java/ads/connection/AdsTcpPlcConnection.java | 2 +
.../apache/plc4x/java/ads/model/AdsDataType.java | 4 +
.../plc4x/java/ads/model/AdsPlcFieldHandler.java | 36 +-
.../ads/protocol/util/LittleEndianDecoder.java | 159 ++-
.../ads/protocol/util/LittleEndianEncoder.java | 21 +-
plc4j/protocols/benchmarks/pom.xml | 9 +-
plc4j/protocols/driver-bases/base/pom.xml | 12 +-
.../base/connection/DefaultPlcFieldHandler.java} | 63 +-
.../java/base/connection/PlcFieldHandler.java | 4 +
.../java/base/messages/DefaultPlcReadRequest.java | 14 +-
.../java/base/messages/DefaultPlcReadResponse.java | 112 ++-
.../base/messages/DefaultPlcSubscriptionEvent.java | 56 +-
.../messages/DefaultPlcSubscriptionRequest.java | 17 +-
.../messages/DefaultPlcUnsubscriptionRequest.java | 8 +-
.../java/base/messages/DefaultPlcWriteRequest.java | 49 +-
.../base/messages/DefaultPlcWriteResponse.java | 5 +
.../base/messages/InternalPlcFieldRequest.java | 6 +
.../java/base/messages/InternalPlcReadRequest.java | 2 +-
.../base/messages/InternalPlcReadResponse.java | 6 +
.../base/messages/InternalPlcWriteRequest.java | 4 +
.../base/messages/InternalPlcWriteResponse.java | 5 +-
...ldItem.java => DefaultBigDecimalFieldItem.java} | 56 +-
.../messages/items/DefaultBigIntegerFieldItem.java | 8 +
.../messages/items/DefaultBooleanFieldItem.java | 5 +-
...eldItem.java => DefaultByteArrayFieldItem.java} | 20 +-
...gerFieldItem.java => DefaultByteFieldItem.java} | 35 +-
...tFieldItem.java => DefaultDoubleFieldItem.java} | 13 +-
...ntFieldItem.java => DefaultFloatFieldItem.java} | 29 +-
.../messages/items/DefaultIntegerFieldItem.java | 31 +-
...eldItem.java => DefaultLocalDateFieldItem.java} | 14 +-
...tem.java => DefaultLocalDateTimeFieldItem.java} | 4 +-
...eldItem.java => DefaultLocalTimeFieldItem.java} | 14 +-
...gerFieldItem.java => DefaultLongFieldItem.java} | 13 +-
...erFieldItem.java => DefaultShortFieldItem.java} | 32 +-
.../plc4x/java/base/messages/items/FieldItem.java | 17 +
.../SingleItemToSingleRequestProtocol.java | 335 +++++++
.../SingleItemToSingleRequestProtocolTest.java | 290 ++++++
plc4j/protocols/driver-bases/pom.xml | 5 +-
plc4j/protocols/driver-bases/raw-socket/pom.xml | 9 +-
plc4j/protocols/driver-bases/serial/pom.xml | 9 +-
plc4j/protocols/driver-bases/tcp/pom.xml | 9 +-
plc4j/protocols/driver-bases/test/pom.xml | 15 +-
.../util/{Junit5Backport.java => HexUtil.java} | 37 +-
plc4j/protocols/ethernetip/pom.xml | 15 +-
.../ethernetip/netty/Plc4XEtherNetIpProtocol.java | 4 +-
.../ethernetip/netty/util/EnipPlcFieldHandler.java | 6 +-
plc4j/protocols/modbus/pom.xml | 14 +-
.../modbus/connection/ModbusTcpPlcConnection.java | 2 +
.../plc4x/java/modbus/model/CoilModbusField.java | 9 +-
.../modbus/model/MaskWriteRegisterModbusField.java | 9 +-
.../plc4x/java/modbus/model/ModbusField.java | 16 +-
.../model/ReadDiscreteInputsModbusField.java | 9 +-
.../model/ReadHoldingRegistersModbusField.java | 9 +-
.../model/ReadInputRegistersModbusField.java | 9 +-
.../java/modbus/model/RegisterModbusField.java | 9 +-
.../java/modbus/netty/Plc4XModbusProtocol.java | 201 +---
.../java/modbus/util/ModbusPlcFieldHandler.java | 126 +--
.../plc4x/java/modbus/ManualPlc4XModbusTest.java | 98 +-
.../connection/BaseModbusPlcConnectionTest.java | 20 +-
.../connection/ModbusSerialPlcConnectionTest.java | 75 +-
.../connection/ModbusTcpPlcConnectionTests.java | 76 --
.../java/modbus/netty/Plc4XModbusProtocolTest.java | 132 ++-
plc4j/protocols/pom.xml | 7 +-
plc4j/protocols/s7/pom.xml | 17 +-
.../messages/items/S7FloatingPointFieldItem.java | 4 +-
...ieldItem.java => S7LocalDateTimeFieldItem.java} | 6 +-
...7IntegerFieldItem.java => S7LongFieldItem.java} | 6 +-
.../org/apache/plc4x/java/s7/model/S7Field.java | 4 +-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 12 +-
.../java/s7/netty/util/S7PlcFieldHandler.java | 36 +-
.../org/apache/plc4x/java/issues/PLC4X56.java} | 46 +-
plc4j/protocols/test/pom.xml | 9 +-
.../apache/plc4x/java/test/TestFieldHandler.java | 42 +-
.../org/apache/plc4x/java/test/TestDeviceTest.java | 4 +-
plc4j/utils/pom.xml | 5 +-
plc4j/utils/raw-sockets/pom.xml | 5 +-
.../rawsockets/netty/AbstractRawSocketChannel.java | 740 --------------
.../netty/AbstractRawSocketStreamChannel.java | 1042 --------------------
.../utils/rawsockets/netty/RawSocketChannel.java | 133 ---
.../rawsockets/netty/RawSocketChannelConfig.java | 187 ----
.../rawsockets/netty/RawSocketChannelSav.java | 186 ----
.../rawsockets/netty/RawSocketEventArray.java | 104 --
.../utils/rawsockets/netty/RawSocketEventLoop.java | 449 ---------
.../src/remote-resources/META-INF/LICENSE | 9 +
.../src/remote-resources/META-INF/NOTICE | 4 +
plc4j/utils/test-utils/pom.xml | 5 +-
plc4j/utils/wireshark-utils/pom.xml | 5 +-
plc4s/pom.xml | 5 +-
pom.xml | 76 +-
src/site/asciidoc/developers/release.adoc | 348 +++++++
.../ads/index.adoc => users/download.adoc} | 13 +-
src/site/site.xml | 2 +
tools/check_sigs.sh | 78 ++
tools/common.sh | 202 ++++
tools/download_staged_release.sh | 138 +++
144 files changed, 3036 insertions(+), 4544 deletions(-)
create mode 100644 README
delete mode 100644 README.md
create mode 100644 RELEASE_NOTES
create mode 100644 examples/google/src/remote-resources/META-INF/LICENSE
delete mode 100644 integrations/apache-kafka/bin/debug.sh
delete mode 100644 integrations/apache-kafka/config/Plc4xSinkConnector.properties
delete mode 100644 integrations/apache-kafka/config/Plc4xSourceConnector.properties
delete mode 100644 integrations/apache-kafka/config/connect-avro-docker.properties
create mode 100644 integrations/apache-kafka/config/sink.properties
create mode 100644 integrations/apache-kafka/config/source.properties
delete mode 100644 integrations/apache-kafka/docker-compose.yml
delete mode 100644 integrations/apache-kafka/src/main/assembly/package.xml
delete mode 100644 integrations/apache-kafka/src/test/java/org/apache/plc4x/kafka/Plc4xSinkConnectorTest.java
delete mode 100644 integrations/apache-kafka/src/test/java/org/apache/plc4x/kafka/Plc4xSinkTaskTest.java
delete mode 100644 integrations/apache-kafka/src/test/java/org/apache/plc4x/kafka/Plc4xSourceConnectorTest.java
delete mode 100644 integrations/apache-kafka/src/test/java/org/apache/plc4x/kafka/Plc4xSourceTaskTest.java
delete mode 100644 integrations/apache-kafka/src/test/resources/logback.xml
copy plc4j/protocols/{ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/netty/util/EnipPlcFieldHandler.java => driver-bases/base/src/main/java/org/apache/plc4x/java/base/connection/DefaultPlcFieldHandler.java} (64%)
copy plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/{DefaultFloatingPointFieldItem.java => DefaultBigDecimalFieldItem.java} (57%)
copy plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/{DefaultStringFieldItem.java => DefaultByteArrayFieldItem.java} (69%)
copy plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/{DefaultIntegerFieldItem.java => DefaultByteFieldItem.java} (81%)
copy plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/{DefaultFloatingPointFieldItem.java => DefaultDoubleFieldItem.java} (91%)
rename plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/{DefaultFloatingPointFieldItem.java => DefaultFloatFieldItem.java} (84%)
copy plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/{DefaultStringFieldItem.java => DefaultLocalDateFieldItem.java} (77%)
rename plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/{DefaultTimeFieldItem.java => DefaultLocalDateTimeFieldItem.java} (92%)
copy plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/{DefaultStringFieldItem.java => DefaultLocalTimeFieldItem.java} (77%)
copy plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/{DefaultIntegerFieldItem.java => DefaultLongFieldItem.java} (91%)
copy plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/{DefaultIntegerFieldItem.java => DefaultShortFieldItem.java} (82%)
create mode 100644 plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java
create mode 100644 plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java
copy plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/util/{Junit5Backport.java => HexUtil.java} (53%)
copy plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/{S7TimeFieldItem.java => S7LocalDateTimeFieldItem.java} (84%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/{S7IntegerFieldItem.java => S7LongFieldItem.java} (87%)
rename plc4j/protocols/s7/src/{main/java/org/apache/plc4x/java/s7/messages/items/S7TimeFieldItem.java => test/java/org/apache/plc4x/java/issues/PLC4X56.java} (52%)
delete mode 100644 plc4j/utils/raw-sockets/src/main/java-sav/org/apache/plc4x/java/utils/rawsockets/netty/AbstractRawSocketChannel.java
delete mode 100644 plc4j/utils/raw-sockets/src/main/java-sav/org/apache/plc4x/java/utils/rawsockets/netty/AbstractRawSocketStreamChannel.java
delete mode 100644 plc4j/utils/raw-sockets/src/main/java-sav/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannel.java
delete mode 100644 plc4j/utils/raw-sockets/src/main/java-sav/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelConfig.java
delete mode 100644 plc4j/utils/raw-sockets/src/main/java-sav/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketChannelSav.java
delete mode 100644 plc4j/utils/raw-sockets/src/main/java-sav/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketEventArray.java
delete mode 100644 plc4j/utils/raw-sockets/src/main/java-sav/org/apache/plc4x/java/utils/rawsockets/netty/RawSocketEventLoop.java
create mode 100644 plc4j/utils/raw-sockets/src/remote-resources/META-INF/LICENSE
create mode 100644 plc4j/utils/raw-sockets/src/remote-resources/META-INF/NOTICE
create mode 100644 src/site/asciidoc/developers/release.adoc
copy src/site/asciidoc/{protocols/ads/index.adoc => users/download.adoc} (50%)
create mode 100755 tools/check_sigs.sh
create mode 100755 tools/common.sh
create mode 100755 tools/download_staged_release.sh