You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2018/10/26 12:51:01 UTC
[incubator-plc4x] branch master updated (1be5d8d -> 952156e)
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from 1be5d8d - Manually reverted the difference between github and gitbox master in order to re-sync the repos.
add 6565175 added metadata interface
add eb1d272 added metadata operation
add 19552c6 added UnsopportedOperationException
add 479f3a7 removed optionals
add fc347aa added licence text
new 952156e Merge remote-tracking branch 'origin/feature/connection-metadata'
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:
.../azure/iothub/S7PlcToAzureIoTHubSample.java | 2 +-
.../dummydriver/connection/DummyConnection.java | 30 ++------------
.../google/iotcore/S7PlcToGoogleIoTCoreSample.java | 2 +-
.../plc4x/java/examples/helloplc4x/HelloPlc4x.java | 6 +--
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 4 +-
.../apache/plc4x/camel/Plc4XPollingConsumer.java | 2 +-
.../java/org/apache/plc4x/camel/Plc4XProducer.java | 4 +-
.../java/org/apache/plc4x/camel/MockDriver.java | 17 ++++----
.../org/apache/plc4x/camel/Plc4XProducerTest.java | 5 ++-
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 9 ++--
.../apache/plc4x/edgent/mock/MockConnection.java | 19 ++++++---
.../java/org/apache/plc4x/kafka/Plc4xSinkTask.java | 4 +-
.../org/apache/plc4x/kafka/Plc4xSourceTask.java | 4 +-
.../org/apache/plc4x/nifi/Plc4xSinkProcessor.java | 4 +-
.../apache/plc4x/nifi/Plc4xSourceProcessor.java | 4 +-
.../org/apache/plc4x/java/api/PlcConnection.java | 48 ++++++++++++++--------
.../PlcUnsupportedOperationException.java} | 9 ++--
.../java/api/metadata/PlcConnectionMetadata.java} | 26 +++++++-----
.../org/apache/plc4x/java/mock/MockConnection.java | 29 +------------
.../ads/connection/AdsAbstractPlcConnection.java | 32 +++++++--------
.../java/ads/connection/AdsTcpPlcConnection.java | 13 ++++--
.../apache/plc4x/java/ads/ManualPlc4XAdsTest.java | 6 +--
.../ads/connection/AdsSerialPlcConnectionTest.java | 2 +-
.../base/connection/AbstractPlcConnection.java | 48 +++++++++++++++++++++-
.../plc4x/java/base/connection/MockConnection.java | 25 -----------
.../connection/BaseEtherNetIpPlcConnection.java | 21 ++++++----
.../connection/EtherNetIpTcpPlcConnection.java | 13 ------
.../java/ethernetip/ManualPlc4XEtherNetIpTest.java | 2 +-
.../modbus/connection/BaseModbusPlcConnection.java | 24 +++++------
.../plc4x/java/modbus/ManualPlc4XModbusTest.java | 10 ++---
.../connection/ModbusSerialPlcConnectionTest.java | 2 +-
.../plc4x/java/s7/connection/S7PlcConnection.java | 36 ++++++++--------
.../apache/plc4x/java/s7/issues/PLC4X47Test.java | 2 +-
.../org/apache/plc4x/java/test/TestConnection.java | 40 ++++++++++++++----
.../connectionpool/PooledPlcDriverManagerTest.java | 41 +++++++++++++-----
.../apache/plc4x/java/opm/PlcEntityManager.java | 8 ++--
36 files changed, 297 insertions(+), 256 deletions(-)
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/{messages/PlcUnsubscriptionResponse.java => exceptions/PlcUnsupportedOperationException.java} (78%)
copy plc4j/{protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TsapParameter.java => api/src/main/java/org/apache/plc4x/java/api/metadata/PlcConnectionMetadata.java} (61%)
[incubator-plc4x] 01/01: Merge remote-tracking branch
'origin/feature/connection-metadata'
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 952156ecfd21e8f0be67d963bee651e64c2b5c67
Merge: 1be5d8d fc347aa
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Oct 26 14:48:32 2018 +0200
Merge remote-tracking branch 'origin/feature/connection-metadata'
.../azure/iothub/S7PlcToAzureIoTHubSample.java | 2 +-
.../dummydriver/connection/DummyConnection.java | 30 ++------------
.../google/iotcore/S7PlcToGoogleIoTCoreSample.java | 2 +-
.../plc4x/java/examples/helloplc4x/HelloPlc4x.java | 6 +--
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 4 +-
.../apache/plc4x/camel/Plc4XPollingConsumer.java | 2 +-
.../java/org/apache/plc4x/camel/Plc4XProducer.java | 4 +-
.../java/org/apache/plc4x/camel/MockDriver.java | 17 ++++----
.../org/apache/plc4x/camel/Plc4XProducerTest.java | 5 ++-
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 9 ++--
.../apache/plc4x/edgent/mock/MockConnection.java | 19 ++++++---
.../java/org/apache/plc4x/kafka/Plc4xSinkTask.java | 4 +-
.../org/apache/plc4x/kafka/Plc4xSourceTask.java | 4 +-
.../org/apache/plc4x/nifi/Plc4xSinkProcessor.java | 4 +-
.../apache/plc4x/nifi/Plc4xSourceProcessor.java | 4 +-
.../org/apache/plc4x/java/api/PlcConnection.java | 48 ++++++++++++++--------
.../PlcUnsupportedOperationException.java | 27 ++++++++++++
.../java/api/metadata/PlcConnectionMetadata.java | 42 +++++++++++++++++++
.../org/apache/plc4x/java/mock/MockConnection.java | 29 +------------
.../ads/connection/AdsAbstractPlcConnection.java | 32 +++++++--------
.../java/ads/connection/AdsTcpPlcConnection.java | 13 ++++--
.../apache/plc4x/java/ads/ManualPlc4XAdsTest.java | 6 +--
.../ads/connection/AdsSerialPlcConnectionTest.java | 2 +-
.../base/connection/AbstractPlcConnection.java | 48 +++++++++++++++++++++-
.../plc4x/java/base/connection/MockConnection.java | 25 -----------
.../connection/BaseEtherNetIpPlcConnection.java | 21 ++++++----
.../connection/EtherNetIpTcpPlcConnection.java | 13 ------
.../java/ethernetip/ManualPlc4XEtherNetIpTest.java | 2 +-
.../modbus/connection/BaseModbusPlcConnection.java | 24 +++++------
.../plc4x/java/modbus/ManualPlc4XModbusTest.java | 10 ++---
.../connection/ModbusSerialPlcConnectionTest.java | 2 +-
.../plc4x/java/s7/connection/S7PlcConnection.java | 36 ++++++++--------
.../apache/plc4x/java/s7/issues/PLC4X47Test.java | 2 +-
.../org/apache/plc4x/java/test/TestConnection.java | 40 ++++++++++++++----
.../connectionpool/PooledPlcDriverManagerTest.java | 41 +++++++++++++-----
.../apache/plc4x/java/opm/PlcEntityManager.java | 8 ++--
36 files changed, 345 insertions(+), 242 deletions(-)