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/10/21 07:53:35 UTC
[plc4x] branch develop updated (5b6e773 -> 543de5c)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from 5b6e773 Merge pull request #88 from dominikriemer/develop
add 66d3c86 [OSGi] Resolved all split package situations.
add e53fb11 [OSGi] Fixing changed package names.
add 63d8993 [OSGi] Fixing changed package names.
add 57cda2f [OSGi] Fixing changed package names.
add 74ebb95 [OSGi] Fixed Component Annotation.
add 64010d0 [OSGi] Added feature for S7 Driver.
add 23165c0 [OSGi] Added version replacement to feature.xml.
add f958e17 - Excluded the slf4j-api module from all karaf modules
add 6389e9a [OSGi] Added initial Implementation of a Exam Test.
add e41822a - Added some more documentation on the plugin execution - Split up one execution of two goals into two separate ones - Added a transformation that injects the "<feature>scr</feature>" into the gerated feature.xml
add ed195bd [OSGi] Tests not running yet.
add d070b9c [OSGi] Finally, integration test is running.
add b289fb9 [OSGi] Refactoring.
add 6d4b467 - Removed the XSL again as it seems that it should also work without.
add 0207eb5 - Added the OSGI Annotation to all remaining drivers - Added a missing OPCUA feature - Added the OPCUA feature to the demo-server
add 68476f4 [OSGi] Added initial Implementation of a Exam Test.
add 8ea7ea0 [OSGi] Tests not running yet.
add b76c41e [OSGi] Finally, integration test is running.
add a6edd44 [OSGi] Refactoring.
add 451f0d5 [Karaf] Improved maven config for IT, added readme.
add f294e17 [Karaf] Removed "old" module in integartions.C
add 0fe46ca [Karaf] Removed "old" module in integartions.
add 528d041 [Karaf] Fixed bug in feature.xml.
add d6af5c7 Fixed review comment, removed unused file.
add ecc5def - Configured the test to work with failsafe instead of surefire - Cleaned up the maven config
add 742d4a0 Update bit-io to newest version with OSGi support
add 4ee6c64 [OSGi] Removed wrap from bit-io as its a OSGi bundle now.
add 717e549 [Karaf] Bumped version of karaf-maven-plugin to 4.2.7.
new 543de5c Merge pull request #89 from JulianFeinauer/feature/resolve-split-package-osgi
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:
plc4j/drivers/ads/pom.xml | 9 +-
.../org/apache/plc4x/java/ads/AdsPlcDriver.java | 2 +
.../ads/connection/AdsSerialPlcConnection.java | 2 +-
.../java/ads/connection/AdsTcpPlcConnection.java | 3 +-
.../apache/plc4x/java/ads/AdsPlcDriverTest.java | 2 +-
.../ads/connection/AdsConnectionFactoryTest.java | 4 +-
.../ads/connection/AdsSerialPlcConnectionTest.java | 4 +-
plc4j/drivers/ethernet-ip/pom.xml | 7 +
.../plc4x/java/ethernetip/EtherNetIpPlcDriver.java | 2 +
.../connection/EtherNetIpTcpPlcConnection.java | 3 +-
plc4j/drivers/modbus/pom.xml | 7 +
.../apache/plc4x/java/modbus/ModbusPlcDriver.java | 2 +
.../connection/ModbusSerialPlcConnection.java | 2 +-
.../modbus/connection/ModbusTcpPlcConnection.java | 3 +-
.../plc4x/java/modbus/ModbusPlcDriverTest.java | 2 +-
.../connection/ModbusConnectionFactoryTest.java | 4 +-
.../connection/ModbusSerialPlcConnectionTest.java | 4 +-
plc4j/drivers/opcua/pom.xml | 6 +
.../apache/plc4x/java/opcua/OpcuaPlcDriver.java | 2 +
plc4j/drivers/s7/pom.xml | 6 +
.../java/org/apache/plc4x/java/s7/S7PlcDriver.java | 2 +
.../plc4x/java/s7/connection/S7PlcConnection.java | 2 +-
.../java/s7/connection/S7PlcTestConnection.java | 2 +-
plc4j/drivers/simulated/pom.xml | 7 +
.../plc4x/java/simulated/SimulatedPlcDriver.java | 2 +
.../dummydriver/connection/DummyConnection.java | 2 +-
.../apache/plc4x/edgent/mock/MockConnection.java | 2 +-
.../apache-karaf/karaf-ads-feature/pom.xml | 61 -------
.../apache-karaf/karaf-demo-server/pom.xml | 127 --------------
.../apache-karaf/karaf-ethernet-ip-feature/pom.xml | 61 -------
.../apache-karaf/karaf-modbus-feature/pom.xml | 61 -------
.../apache-karaf/karaf-s7-feature/pom.xml | 61 -------
.../apache-karaf/karaf-simulated-feature/pom.xml | 61 -------
plc4j/integrations/apache-karaf/pom.xml | 98 -----------
plc4j/integrations/pom.xml | 1 -
plc4j/karaf-features/README.md | 42 +++++
plc4j/karaf-features/karaf-itest/pom.xml | 189 +++++++++++++++++++++
.../java/org/apache/plc4x/karaf/FeatureIT.java | 100 +++++++++++
.../test/resources/etc/org.ops4j.pax.logging.cfg | 71 ++++++++
plc4j/karaf-features/pom.xml | 116 +++++++++++++
.../driver-bases => karaf-features/s7}/pom.xml | 41 +++--
.../karaf-features/s7/src/main/feature/feature.xml | 48 ++++++
.../java/org/apache/plc4x/karaf/FeatureTest.java | 91 ++++++++++
plc4j/pom.xml | 2 +
.../java/org/apache/plc4x/java/ads/AdsDumper.java | 2 +-
.../commands/types/AdsNotificationSampleTest.java | 2 +-
.../ads/api/commands/types/AdsStampHeaderTest.java | 2 +-
...load2SerialProtocolExampleConversationTest.java | 2 +-
.../java/ads/protocol/Plc4x2AdsProtocolTest.java | 4 +-
.../java/ads/protocol/util/DigestUtilTest.java | 2 +-
.../connection}/connection/SerialChannel.java | 3 +-
.../connection/SerialChannelFactory.java | 3 +-
.../connection/SerialChannelHandler.java | 2 +-
.../connection/SerialPollingSelector.java | 5 +-
.../connection}/connection/SerialSelectionKey.java | 3 +-
.../connection/SerialSelectorProvider.java | 2 +-
.../connection/SerialSocketAddress.java | 2 +-
.../connection/SerialSocketChannel.java | 2 +-
.../base/connection/SerialChannelFactoryTest.java | 3 +
.../connection/TcpSocketChannelFactory.java | 3 +-
.../{base => mock}/connection/MockConnection.java | 3 +-
.../connection/TestChannelFactory.java | 3 +-
.../connection/tcp/TcpHexDumper.java | 2 +-
.../protocol/Plc4XSupportedDataTypes.java | 2 +-
.../plc4x/java/{base => mock}/util/Assert.java | 2 +-
.../plc4x/java/{base => mock}/util/HexUtil.java | 2 +-
.../plc4x/java/modbus/ManualPlc4XModbusTest.java | 2 +-
.../java/modbus/netty/Plc4XModbusProtocolTest.java | 6 +-
pom.xml | 15 +-
.../java/abeth/connection/AbEthPlcConnection.java | 3 +-
.../java/df1/connection/SerialDf1Connection.java | 2 +-
71 files changed, 807 insertions(+), 603 deletions(-)
delete mode 100644 plc4j/integrations/apache-karaf/karaf-ads-feature/pom.xml
delete mode 100644 plc4j/integrations/apache-karaf/karaf-demo-server/pom.xml
delete mode 100644 plc4j/integrations/apache-karaf/karaf-ethernet-ip-feature/pom.xml
delete mode 100644 plc4j/integrations/apache-karaf/karaf-modbus-feature/pom.xml
delete mode 100644 plc4j/integrations/apache-karaf/karaf-s7-feature/pom.xml
delete mode 100644 plc4j/integrations/apache-karaf/karaf-simulated-feature/pom.xml
delete mode 100644 plc4j/integrations/apache-karaf/pom.xml
create mode 100644 plc4j/karaf-features/README.md
create mode 100644 plc4j/karaf-features/karaf-itest/pom.xml
create mode 100644 plc4j/karaf-features/karaf-itest/src/test/java/org/apache/plc4x/karaf/FeatureIT.java
create mode 100644 plc4j/karaf-features/karaf-itest/src/test/resources/etc/org.ops4j.pax.logging.cfg
create mode 100644 plc4j/karaf-features/pom.xml
copy plc4j/{protocols/driver-bases => karaf-features/s7}/pom.xml (51%)
create mode 100644 plc4j/karaf-features/s7/src/main/feature/feature.xml
create mode 100644 plc4j/karaf-features/s7/src/test/java/org/apache/plc4x/karaf/FeatureTest.java
rename plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/{base => serial/connection}/connection/SerialChannel.java (99%)
rename plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/{base => serial/connection}/connection/SerialChannelFactory.java (96%)
rename plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/{base => serial/connection}/connection/SerialChannelHandler.java (98%)
rename plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/{base => serial/connection}/connection/SerialPollingSelector.java (97%)
rename plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/{base => serial/connection}/connection/SerialSelectionKey.java (95%)
rename plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/{base => serial/connection}/connection/SerialSelectorProvider.java (97%)
rename plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/{base => serial/connection}/connection/SerialSocketAddress.java (96%)
rename plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/{base => serial/connection}/connection/SerialSocketChannel.java (98%)
rename plc4j/protocols/driver-bases/tcp/src/main/java/org/apache/plc4x/java/{base => tcp}/connection/TcpSocketChannelFactory.java (97%)
rename plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/{base => mock}/connection/MockConnection.java (91%)
rename plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/{base => mock}/connection/TestChannelFactory.java (92%)
rename plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/{base => mock}/connection/tcp/TcpHexDumper.java (98%)
rename plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/{base => mock}/protocol/Plc4XSupportedDataTypes.java (99%)
rename plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/{base => mock}/util/Assert.java (98%)
rename plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/{base => mock}/util/HexUtil.java (97%)
[plc4x] 01/01: Merge pull request #89 from
JulianFeinauer/feature/resolve-split-package-osgi
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 543de5ceb8dbd9ac994fb793cdb4a54eb3e4c4c7
Merge: 5b6e773 717e549
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Oct 21 09:53:26 2019 +0200
Merge pull request #89 from JulianFeinauer/feature/resolve-split-package-osgi
Feature/resolve split package osgi
plc4j/drivers/ads/pom.xml | 9 +-
.../org/apache/plc4x/java/ads/AdsPlcDriver.java | 2 +
.../ads/connection/AdsSerialPlcConnection.java | 2 +-
.../java/ads/connection/AdsTcpPlcConnection.java | 3 +-
.../apache/plc4x/java/ads/AdsPlcDriverTest.java | 2 +-
.../ads/connection/AdsConnectionFactoryTest.java | 4 +-
.../ads/connection/AdsSerialPlcConnectionTest.java | 4 +-
plc4j/drivers/ethernet-ip/pom.xml | 7 +
.../plc4x/java/ethernetip/EtherNetIpPlcDriver.java | 2 +
.../connection/EtherNetIpTcpPlcConnection.java | 3 +-
plc4j/drivers/modbus/pom.xml | 7 +
.../apache/plc4x/java/modbus/ModbusPlcDriver.java | 2 +
.../connection/ModbusSerialPlcConnection.java | 2 +-
.../modbus/connection/ModbusTcpPlcConnection.java | 3 +-
.../plc4x/java/modbus/ModbusPlcDriverTest.java | 2 +-
.../connection/ModbusConnectionFactoryTest.java | 4 +-
.../connection/ModbusSerialPlcConnectionTest.java | 4 +-
plc4j/drivers/opcua/pom.xml | 6 +
.../apache/plc4x/java/opcua/OpcuaPlcDriver.java | 2 +
plc4j/drivers/s7/pom.xml | 6 +
.../java/org/apache/plc4x/java/s7/S7PlcDriver.java | 2 +
.../plc4x/java/s7/connection/S7PlcConnection.java | 2 +-
.../java/s7/connection/S7PlcTestConnection.java | 2 +-
plc4j/drivers/simulated/pom.xml | 7 +
.../plc4x/java/simulated/SimulatedPlcDriver.java | 2 +
.../dummydriver/connection/DummyConnection.java | 2 +-
.../apache/plc4x/edgent/mock/MockConnection.java | 2 +-
.../apache-karaf/karaf-ads-feature/pom.xml | 61 -------
.../apache-karaf/karaf-demo-server/pom.xml | 127 --------------
.../apache-karaf/karaf-ethernet-ip-feature/pom.xml | 61 -------
.../apache-karaf/karaf-modbus-feature/pom.xml | 61 -------
.../apache-karaf/karaf-s7-feature/pom.xml | 61 -------
.../apache-karaf/karaf-simulated-feature/pom.xml | 61 -------
plc4j/integrations/apache-karaf/pom.xml | 98 -----------
plc4j/integrations/pom.xml | 1 -
plc4j/karaf-features/README.md | 42 +++++
plc4j/karaf-features/karaf-itest/pom.xml | 189 +++++++++++++++++++++
.../java/org/apache/plc4x/karaf/FeatureIT.java | 100 +++++++++++
.../test/resources/etc/org.ops4j.pax.logging.cfg | 71 ++++++++
plc4j/karaf-features/pom.xml | 116 +++++++++++++
plc4j/karaf-features/s7/pom.xml | 51 ++++++
.../karaf-features/s7/src/main/feature/feature.xml | 48 ++++++
.../java/org/apache/plc4x/karaf/FeatureTest.java | 91 ++++++++++
plc4j/pom.xml | 2 +
.../java/org/apache/plc4x/java/ads/AdsDumper.java | 2 +-
.../commands/types/AdsNotificationSampleTest.java | 2 +-
.../ads/api/commands/types/AdsStampHeaderTest.java | 2 +-
...load2SerialProtocolExampleConversationTest.java | 2 +-
.../java/ads/protocol/Plc4x2AdsProtocolTest.java | 4 +-
.../java/ads/protocol/util/DigestUtilTest.java | 2 +-
.../connection}/connection/SerialChannel.java | 3 +-
.../connection/SerialChannelFactory.java | 3 +-
.../connection/SerialChannelHandler.java | 2 +-
.../connection/SerialPollingSelector.java | 5 +-
.../connection}/connection/SerialSelectionKey.java | 3 +-
.../connection/SerialSelectorProvider.java | 2 +-
.../connection/SerialSocketAddress.java | 2 +-
.../connection/SerialSocketChannel.java | 2 +-
.../base/connection/SerialChannelFactoryTest.java | 3 +
.../connection/TcpSocketChannelFactory.java | 3 +-
.../{base => mock}/connection/MockConnection.java | 3 +-
.../connection/TestChannelFactory.java | 3 +-
.../connection/tcp/TcpHexDumper.java | 2 +-
.../protocol/Plc4XSupportedDataTypes.java | 2 +-
.../plc4x/java/{base => mock}/util/Assert.java | 2 +-
.../plc4x/java/{base => mock}/util/HexUtil.java | 2 +-
.../plc4x/java/modbus/ManualPlc4XModbusTest.java | 2 +-
.../java/modbus/netty/Plc4XModbusProtocolTest.java | 6 +-
pom.xml | 15 +-
.../java/abeth/connection/AbEthPlcConnection.java | 3 +-
.../java/df1/connection/SerialDf1Connection.java | 2 +-
71 files changed, 835 insertions(+), 585 deletions(-)