This is an automated email from the ASF dual-hosted git repository. erobinet pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit f3fb43cd0a7147a24f0cb49d6ca3b335bd28e582 Merge: 2fe9929 5ee31f7 Author: etiennerobinet <61242848+etiennerobi...@users.noreply.github.com> AuthorDate: Tue May 12 09:51:07 2020 +0200 Merge pull request #154 from apache/feature/osgi Feature/osgi plc4j/api/pom.xml | 3 +- .../org/apache/plc4x/java/PlcDriverManager.java | 2 +- plc4j/drivers/eip/pom.xml | 17 +++++-- .../apache/plc4x/java/eip/readwrite/EIPDriver.java | 3 -- .../java/eip/readwrite/field/EipFieldHandler.java | 2 +- .../eip/readwrite/protocol/EipProtocolLogic.java | 11 +++-- plc4j/drivers/s7/pom.xml | 18 +++++--- .../apache/plc4x/java/s7/readwrite/S7Driver.java | 3 -- plc4j/integrations/apache-camel/pom.xml | 31 +++++++------ .../org/apache/plc4x/camel/Plc4XComponent.java | 28 ++++++----- .../java/org/apache/plc4x/camel/Plc4XConsumer.java | 36 +++++++-------- .../java/org/apache/plc4x/camel/Plc4XEndpoint.java | 35 ++------------ .../apache/plc4x/camel/Plc4XPollingConsumer.java | 53 +++++++++++---------- .../main/java/org/apache/plc4x/camel/TagData.java | 41 ++++++++++++++++ .../java/org/apache/plc4x/camel/ManualTest.java | 9 ---- plc4j/karaf-features/eip/pom.xml | 6 +++ plc4j/karaf-features/s7/pom.xml | 5 ++ plc4j/{transports/tcp => osgi}/pom.xml | 36 +++++++-------- .../apache/plc4x/java/osgi/DriverActivator.java | 53 +++++++++++++++++++++ .../apache/plc4x/java/osgi/TransportActivator.java | 54 ++++++++++++++++++++++ plc4j/pom.xml | 5 +- plc4j/spi/pom.xml | 15 ++++++ plc4j/transports/tcp/pom.xml | 19 ++++++++ 23 files changed, 325 insertions(+), 160 deletions(-)